Skip to content

Commit cf7050e

Browse files
chore: bump to nightly-2025-05-12
1 parent d005dcd commit cf7050e

File tree

17 files changed

+83
-270
lines changed

17 files changed

+83
-270
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
pull_request:
66
branches:
77
- main
8+
- nightly-testing
89
release:
910
types:
1011
- published
@@ -220,7 +221,7 @@ jobs:
220221
name: Deploy preview
221222
runs-on: ubuntu-latest
222223
needs: [build]
223-
if: github.event_name == 'push' && github.ref_name == 'main'
224+
if: github.event_name == 'push' && github.ref_name == 'nightly-testing'
224225
steps:
225226
- name: Get generated HTML from artifact storage
226227
uses: actions/download-artifact@v4

Manual/BuildTools/Lake/CLI.lean

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,19 @@ Otherwise, the provided command is invoked in Lake's environment.
143143
::::paragraph
144144
The following variables are set, overriding previous values:
145145
:::table align:=left
146-
* row
146+
*
147147
* {envVar def:=true}`LAKE`
148148
* The detected Lake executable
149-
* row
149+
*
150150
* {envVar}`LAKE_HOME`
151151
* The detected {tech}[Lake home]
152-
* row
152+
*
153153
* {envVar}`LEAN_SYSROOT`
154154
* The detected Lean {tech}[toolchain] directory
155-
* row
155+
*
156156
* {envVar}`LEAN_AR`
157157
* The detected Lean `ar` binary
158-
* row
158+
*
159159
* {envVar}`LEAN_CC`
160160
* The detected C compiler (if not using the bundled one)
161161
:::
@@ -164,20 +164,20 @@ The following variables are set, overriding previous values:
164164
::::paragraph
165165
The following variables are augmented with additional information:
166166
:::table align:=left
167-
* row
167+
*
168168
* {envVar}`LEAN_PATH`
169169
* Lake's and the {tech}[workspace]'s Lean {tech}[library directories] are added.
170-
* row
170+
*
171171
* {envVar}`LEAN_SRC_PATH`
172172
* Lake's and the {tech}[workspace]'s {tech}[source directories] are added.
173-
* row
173+
*
174174
* {envVar}`PATH`
175175
* Lean's, Lake's, and the {tech}[workspace]'s {tech}[binary directories] are added.
176176
On Windows, Lean's and the {tech}[workspace]'s {tech}[library directories] are also added.
177-
* row
177+
*
178178
* {envVar}`DYLD_LIBRARY_PATH`
179179
* On macOS, Lean's and the {tech}[workspace]'s {tech}[library directories] are added.
180-
* row
180+
*
181181
* {envVar}`LD_LIBRARY_PATH`
182182
* On platforms other than Windows and macOS, Lean's and the {tech}[workspace]'s {tech}[library directories] are added.
183183
:::
@@ -186,33 +186,33 @@ The following variables are augmented with additional information:
186186
::::paragraph
187187
Lake itself can be configured with the following environment variables:
188188
:::table align:=left
189-
* row
189+
*
190190
* {envVar def:=true}`ELAN_HOME`
191191
* The location of the {ref "elan"}[Elan] installation, which is used for {ref "automatic-toolchain-updates"}[automatic toolchain updates].
192192

193-
* row
193+
*
194194
* {envVar def:=true}`ELAN`
195195
* The location of the `elan` binary, which is used for {ref "automatic-toolchain-updates"}[automatic toolchain updates].
196196
If it is not set, an occurrence of `elan` must exist on the {envVar}`PATH`.
197197

198-
* row
198+
*
199199
* {envVar def:=true}`LAKE_HOME`
200200
* The location of the Lake installation.
201201
This environment variable is only consulted when Lake is unable to determine its installation path from the location of the `lake` executable that's currently running.
202-
* row
202+
*
203203
* {envVar def:=true}`LEAN_SYSROOT`
204204
* The location of the Lean installation, used to find the Lean compiler, the standard library, and other bundled tools.
205205
Lake first checks whether its binary is colocated with a Lean install, using that installation if so.
206206
If not, or if {envVar def:=true}`LAKE_OVERRIDE_LEAN` is true, then Lake consults {envVar}`LEAN_SYSROOT`.
207207
If this is not set, Lake consults the {envVar def:=true}`LEAN` environment variable to find the Lean compiler, and attempts to find the Lean installation relative to the compiler.
208208
If {envVar}`LEAN` is set but empty, Lake considers Lean to be disabled.
209209
If {envVar}`LEAN_SYSROOT` and {envVar}`LEAN` are unset, the first occurrence of `lean` on the {envVar}`PATH` is used to find the installation.
210-
* row
210+
*
211211
* {envVar def:=true}`LEAN_CC` and {envVar def:=true}`LEAN_AR`
212212
* If {envVar}`LEAN_CC` and/or {envVar}`LEAN_AR` is set, its value is used as the C compiler or `ar` command when building libraries.
213213
If not, Lake will fall back to the bundled tool in the Lean installation.
214214
If the bundled tool is not found, the value of {envVar def:=true}`CC` or {envVar def:=true}`AR`, followed by a `cc` or `ar` on the {envVar}`PATH`, are used.
215-
* row
215+
*
216216
* {envVar def:=true}`LAKE_NO_CACHE`
217217
* If true, Lake does not use cached builds from [Reservoir](https://reservoir.lean-lang.org/) or {ref "lake-github"}[GitHub].
218218
This environment variable can be overridden using the {lakeOpt}`--try-cache` command-line option.
@@ -507,25 +507,25 @@ They are listed in {ref "lake-facets"}[the section on facets].
507507
::::example "Target and Facet Specifications"
508508

509509
:::table
510-
* ignored
510+
*
511511
- `a`
512512
- The {tech}[default facet](s) of target `a`
513-
* ignored
513+
*
514514
- `@a`
515515
- The {tech}[default targets] of {tech}[package] `a`
516-
* ignored
516+
*
517517
- `+A`
518518
- The Lean artifacts of module `A` (because the default facet of modules is `leanArts`)
519-
* ignored
519+
*
520520
- `@a/b`
521521
- The default facet of target `b` of package `a`
522-
* ignored
522+
*
523523
- `@a/+A:c`
524524
- The C file compiled from module `A` of package `a`
525-
* ignored
525+
*
526526
- `:foo`
527527
- The {tech}[root package]'s facet `foo`
528-
* ignored
528+
*
529529
- `A/B/C.lean:o`
530530
- The compiled object code for the module in the file `A/B/C.lean`
531531
:::

Manual/Intro.lean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ declaration uses 'sorry'
9999

100100
Error messages are shown like this:
101101
```leanOutput output (severity := error)
102-
application type mismatch
102+
Application type mismatch: In the appplication
103103
Nat.succ "two"
104-
argument
104+
the final argument
105105
"two"
106106
has type
107107
String : Type

Manual/Language/InductiveTypes/Structures.lean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,9 @@ it is a type error to apply {name}`printEven` directly to {name}`two`:
533533
#check printEven two
534534
```
535535
```leanOutput printTwo
536-
application type mismatch
536+
Application type mismatch: In the appplication
537537
printEven two
538-
argument
538+
the final argument
539539
two
540540
has type
541541
EvenPrime : Type

Manual/Meta.lean

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import Manual.Meta.LakeOpt
2828
import Manual.Meta.LakeToml
2929
import Manual.Meta.ParserAlias
3030
import Manual.Meta.Syntax
31-
import Manual.Meta.Table
3231
import Manual.Meta.Tactics
3332
import Manual.Meta.SpliceContents
3433
import Manual.Meta.Markdown

Manual/Meta/LakeToml.lean

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,8 @@ def checkToml (α : Type) [Inhabited α] [DecodeToml α] [Toml.Test α] (str :
674674
match (← Lake.Toml.loadToml ictx |>.toBaseIO) with
675675
| .error err =>
676676
return .error <| toString (← err.unreported.toArray.mapM (·.toString))
677-
| .ok table =>
678-
let .ok (out : α) errs := (table.tryDecode what).run #[]
677+
| .ok tbl =>
678+
let .ok (out : α) errs := (tbl.tryDecode what).run #[]
679679
.ok <$> report out errs
680680

681681
structure Named (α : Name → Type u) where
@@ -700,9 +700,9 @@ def checkTomlArrayWithName (α : Name → Type) [(n : Name) → Inhabited (α n)
700700
match (← Lake.Toml.loadToml ictx |>.toBaseIO) with
701701
| .error err =>
702702
return .error <| toString (← err.unreported.toArray.mapM (·.toString))
703-
| .ok table =>
704-
let .ok (name : Name) errs := (table.tryDecode `name).run #[]
705-
let .ok out errs := (table.tryDecode what).run errs
703+
| .ok tbl =>
704+
let .ok (name : Name) errs := (tbl.tryDecode `name).run #[]
705+
let .ok out errs := (tbl.tryDecode what).run errs
706706
.ok <$> report (out : α name) errs
707707

708708

@@ -713,19 +713,19 @@ def checkTomlPackage [Lean.MonadError m] (str : String) : m (Except String Strin
713713
match (← Lake.Toml.loadToml ictx |>.toBaseIO) with
714714
| .error err =>
715715
return .error <| toString (← err.unreported.toArray.mapM (·.toString))
716-
| .ok table =>
716+
| .ok tbl =>
717717
let .ok env ←
718718
EIO.toBaseIO <|
719719
Lake.Env.compute {home:=""} {sysroot:=""} none none
720720
| throwError "Failed to make env"
721721
let cfg : LoadConfig := {lakeEnv := env, wsDir := "."}
722722
let .ok (pkg : Lake.Package) errs := Id.run <| (EStateM.run · #[]) <| do
723-
let name ← stringToLegalOrSimpleName <$> table.tryDecode `name
724-
let config : PackageConfig name ← PackageConfig.decodeToml table
725-
let (targetDecls, targetDeclMap) ← decodeTargetDecls name table
726-
let defaultTargets ← table.tryDecodeD `defaultTargets #[]
723+
let name ← stringToLegalOrSimpleName <$> tbl.tryDecode `name
724+
let config : PackageConfig name ← PackageConfig.decodeToml tbl
725+
let (targetDecls, targetDeclMap) ← decodeTargetDecls name tbl
726+
let defaultTargets ← tbl.tryDecodeD `defaultTargets #[]
727727
let defaultTargets := defaultTargets.map stringToLegalOrSimpleName
728-
let depConfigs ← table.tryDecodeD `require #[]
728+
let depConfigs ← tbl.tryDecodeD `require #[]
729729
pure {
730730
dir := cfg.pkgDir
731731
relDir := cfg.relPkgDir

Manual/Meta/Monotonicity.lean

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import Verso
99
import Manual.Meta.Attribute
1010
import Manual.Meta.Basic
1111
import Manual.Meta.CustomStyle
12-
import Manual.Meta.Table
1312

1413
open Lean Meta Elab
1514
open Verso Doc Elab Manual

0 commit comments

Comments
 (0)