Skip to content

Commit 8cb0455

Browse files
authored
chore: bump toolchain to v4.32.0-rc1 (#885)
1 parent d6e6aee commit 8cb0455

8 files changed

Lines changed: 21 additions & 22 deletions

File tree

lake-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "git",
66
"subDir": null,
77
"scope": "",
8-
"rev": "20b8493528eed2fac9827ce18d41c475f0e1c50a",
8+
"rev": "ae95e7e7d01c072421732d0b84cf63ff903f4f0e",
99
"name": "illuminate",
1010
"manifestFile": "lake-manifest.json",
1111
"inputRev": "main",
@@ -15,7 +15,7 @@
1515
"type": "git",
1616
"subDir": null,
1717
"scope": "",
18-
"rev": "63045536fe95024e6c18fc7b48e03f506701c5bc",
18+
"rev": "f3f26cc72646205ca167117487c008ee1dafe816",
1919
"name": "plausible",
2020
"manifestFile": "lake-manifest.json",
2121
"inputRev": "main",

lean-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
leanprover/lean4:v4.31.0
1+
leanprover/lean4:v4.32.0-rc1

src/verso-manual/VersoManual/Docstring.lean

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -583,20 +583,19 @@ def inheritance.descr : BlockDescr where
583583
open Verso.Output Html in do
584584
let .ok (name, parents) := FromJson.fromJson? (α := Name × Array Block.Docstring.ParentInfo) info
585585
| do reportError "Failed to deserialize docstring structure inheritance data while generating HTML"; pure .empty
586-
let parentRow ← do
587-
if parents.isEmpty then pure .empty
588-
else pure {{
589-
<ul class="extends">
590-
{{← parents.mapM fun parent => do
591-
let filterId := s!"{parent.index}-{parent.name}-{name}"
592-
pure {{
593-
<li>
594-
<input type="checkbox" id={{filterId}} data-parent-idx={{toString parent.index}}/>
595-
<label for={{filterId}}><code class="hl lean inline">{{← parent.parent.toHtml (g := Manual)}}</code></label>
596-
</li>}}
597-
}}
598-
</ul>
599-
}}
586+
if parents.isEmpty then pure .empty
587+
else pure {{
588+
<ul class="extends">
589+
{{← parents.mapM fun parent => do
590+
let filterId := s!"{parent.index}-{parent.name}-{name}"
591+
pure {{
592+
<li>
593+
<input type="checkbox" id={{filterId}} data-parent-idx={{toString parent.index}}/>
594+
<label for={{filterId}}><code class="hl lean inline">{{← parent.parent.toHtml (g := Manual)}}</code></label>
595+
</li>}}
596+
}}
597+
</ul>
598+
}}
600599

601600
open Block.Docstring (Visibility) in
602601
@[block_extension Block.fieldSignature]

src/verso/Verso/Doc/ArgParse.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ partial def parseArgs : ArgParse m α → ExceptT (Array Doc.Arg × Exception) (
473473
| true => some val
474474
| false => val
475475
| .error e => throwThe (Array Doc.Arg × Exception) e
476-
else match optional with
476+
else match (dependent := true) optional with
477477
| true => Pure.pure none
478478
| false => throwThe (Array Doc.Arg × Exception) ((← get).remaining, .error (← getRef) m!"Named argument '{x}' ({vp.description}) not found")
479479
| .anyNamed x vp doc? => do

src/verso/Verso/Doc/Elab/Block.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public partial def elabBlock (block : TSyntax `block) : DocElabM (TSyntax `term)
3636
``(sorryAx (Block _) (synthetic := true))
3737
| stx@(.node _ kind _) =>
3838
let env ← getEnv
39-
let result ← match (← liftMacroM (expandMacroImpl? env stx)) with
39+
match (← liftMacroM (expandMacroImpl? env stx)) with
4040
| some (_decl, stxNew?) => -- TODO terminfo here? Right now, we suppress most uses of it.
4141
let stxNew ← liftMacroM <| liftExcept stxNew?
4242
withMacroExpansionInfo stx stxNew <|

src/verso/Verso/Doc/Elab/Inline.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public partial def elabInline (inline : TSyntax `inline) : DocElabM (TSyntax `te
2828
``(sorryAx (Inline _) (synthetic := true))
2929
| stx@(.node _ kind _) =>
3030
let env ← getEnv
31-
let result ← match (← liftMacroM (expandMacroImpl? env stx)) with
31+
match (← liftMacroM (expandMacroImpl? env stx)) with
3232
| some (_decl, stxNew?) => -- TODO terminfo here? Right now, we suppress most uses of it.
3333
let stxNew ← liftMacroM <| liftExcept stxNew?
3434
withMacroExpansionInfo stx stxNew <|
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
leanprover/lean4:v4.31.0
1+
leanprover/lean4:v4.32.0-rc1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
leanprover/lean4:v4.31.0
1+
leanprover/lean4:v4.32.0-rc1

0 commit comments

Comments
 (0)