Skip to content

Commit 0d37cc7

Browse files
chore: bump toolchain to v4.29.0 (#463)
Co-authored-by: Chris Henson <chrishenson.net@gmail.com>
1 parent 4ab77e0 commit 0d37cc7

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

Cslib/Foundations/Data/Relation.lean

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,26 +181,27 @@ theorem ChurchRosser.normal_eq (cr : ChurchRosser r) (nx : Normal r x) (ny : Nor
181181

182182
/-- A pair of subrelations lifts to transitivity on the relation. -/
183183
@[implicit_reducible]
184-
def trans_of_subrelation (s s' r : α → α → Prop) (hr : Transitive r)
184+
def trans_of_subrelation (s s' r : α → α → Prop) (hr : IsTrans α r)
185185
(h : Subrelation s r) (h' : Subrelation s' r) : Trans s s' r where
186-
trans hab hbc := hr (h hab) (h' hbc)
186+
trans hab hbc := hr.trans _ _ _ (h hab) (h' hbc)
187187

188188
/-- A subrelation lifts to transitivity on the left of the relation. -/
189189
@[implicit_reducible]
190-
def trans_of_subrelation_left (s r : α → α → Prop) (hr : Transitive r)
190+
def trans_of_subrelation_left (s r : α → α → Prop) (hr : IsTrans α r)
191191
(h : Subrelation s r) : Trans s r r where
192-
trans hab hbc := hr (h hab) hbc
192+
trans hab hbc := hr.trans _ _ _ (h hab) hbc
193193

194194
/-- A subrelation lifts to transitivity on the right of the relation. -/
195195
@[implicit_reducible]
196-
def trans_of_subrelation_right (s r : α → α → Prop) (hr : Transitive r)
196+
def trans_of_subrelation_right (s r : α → α → Prop) (hr : IsTrans α r)
197197
(h : Subrelation s r) : Trans r s r where
198-
trans hab hbc := hr hab (h hbc)
198+
trans hab hbc := hr.trans _ _ _ hab (h hbc)
199199

200200
/-- Confluence implies that multi-step joinability is an equivalence. -/
201201
theorem Confluent.equivalence_join_reflTransGen (h : Confluent r) :
202202
Equivalence (Join (ReflTransGen r)) := by
203-
grind [equivalence_join, reflexive_reflTransGen, transitive_reflTransGen]
203+
apply equivalence_join reflexive_reflTransGen inferInstance
204+
grind
204205

205206
/-- A relation is terminating when the inverse of its transitive closure is well-founded.
206207
Note that this is also called Noetherian or strongly normalizing in the literature. -/

Cslib/Languages/CombinatoryLogic/Confluence.lean

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ theorem reflTransGen_parallelReduction_mRed :
9292
ReflTransGen ParallelReduction = ReflTransGen Red := by
9393
ext a b
9494
constructor
95-
· apply Relation.reflTransGen_of_transitive_reflexive
96-
· exact fun _ => by rfl
97-
· exact Relation.transitive_reflTransGen
95+
· apply Relation.reflTransGen_of_isTrans_reflexive
96+
· exact Relation.reflexive_reflTransGen
97+
· infer_instance
9898
· exact @mRed_of_parallelReduction
99-
· apply Relation.reflTransGen_of_transitive_reflexive
99+
· apply Relation.reflTransGen_of_isTrans_reflexive
100100
· exact Relation.reflexive_reflTransGen
101-
· exact Relation.transitive_reflTransGen
101+
· infer_instance
102102
· exact fun a a' h => Relation.ReflTransGen.single (parallelReduction_of_red h)
103103

104104
/-!

lake-manifest.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "git",
66
"subDir": null,
77
"scope": "leanprover-community",
8-
"rev": "698d2b68b870f1712040ab0c233d34372d4b56df",
8+
"rev": "1a37cd3c8e618022c5e78dee604c75c3c946a681",
99
"name": "mathlib",
1010
"manifestFile": "lake-manifest.json",
1111
"inputRev": "master",
@@ -15,7 +15,7 @@
1515
"type": "git",
1616
"subDir": null,
1717
"scope": "leanprover-community",
18-
"rev": "22a0afa903bcf65285152eea298a3d319badc78d",
18+
"rev": "83e90935a17ca19ebe4b7893c7f7066e266f50d3",
1919
"name": "plausible",
2020
"manifestFile": "lake-manifest.json",
2121
"inputRev": "main",
@@ -35,7 +35,7 @@
3535
"type": "git",
3636
"subDir": null,
3737
"scope": "leanprover-community",
38-
"rev": "db22912cdd820b2a2bd84bd25273cb322ff09ead",
38+
"rev": "48d5698bc464786347c1b0d859b18f938420f060",
3939
"name": "importGraph",
4040
"manifestFile": "lake-manifest.json",
4141
"inputRev": "main",
@@ -45,17 +45,17 @@
4545
"type": "git",
4646
"subDir": null,
4747
"scope": "leanprover-community",
48-
"rev": "136730b5a40dc633967f5433cb7668df5c3bf9a3",
48+
"rev": "00fe208b8e1364736cca3a9b9601c4fe865856af",
4949
"name": "proofwidgets",
5050
"manifestFile": "lake-manifest.json",
51-
"inputRev": "v0.0.94",
51+
"inputRev": "main",
5252
"inherited": true,
5353
"configFile": "lakefile.lean"},
5454
{"url": "https://github.com/leanprover-community/aesop",
5555
"type": "git",
5656
"subDir": null,
5757
"scope": "leanprover-community",
58-
"rev": "3426969888a264d3f69b6f30ab50aa11f28eb38d",
58+
"rev": "7152850e7b216a0d409701617721b6e469d34bf6",
5959
"name": "aesop",
6060
"manifestFile": "lake-manifest.json",
6161
"inputRev": "master",
@@ -65,7 +65,7 @@
6565
"type": "git",
6666
"subDir": null,
6767
"scope": "leanprover-community",
68-
"rev": "3a9fde028258300f1cbb003d457d47c8d8e16b1c",
68+
"rev": "707efb56d0696634e9e965523a1bbe9ac6ce141d",
6969
"name": "Qq",
7070
"manifestFile": "lake-manifest.json",
7171
"inputRev": "master",
@@ -75,7 +75,7 @@
7575
"type": "git",
7676
"subDir": null,
7777
"scope": "leanprover-community",
78-
"rev": "bce25af79ec73f5e63240d4399a4cd8a6a227fcb",
78+
"rev": "756e3321fd3b02a85ffda19fef789916223e578c",
7979
"name": "batteries",
8080
"manifestFile": "lake-manifest.json",
8181
"inputRev": "main",
@@ -85,10 +85,10 @@
8585
"type": "git",
8686
"subDir": null,
8787
"scope": "leanprover",
88-
"rev": "61cd682f2a25175996bc1b9e8d8231e76cded866",
88+
"rev": "7802da01beb530bf051ab657443f9cd9bc3e1a29",
8989
"name": "Cli",
9090
"manifestFile": "lake-manifest.json",
91-
"inputRev": "v4.29.0-rc8",
91+
"inputRev": "v4.29.0",
9292
"inherited": true,
9393
"configFile": "lakefile.toml"}],
9494
"name": "cslib",

lean-toolchain

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

0 commit comments

Comments
 (0)