Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
171 commits
Select commit Hold shift + click to select a range
32340fe
bump toolchain
kim-em Sep 16, 2025
d7ef53a
Merge branch 'main' into nightly-testing
kim-em Oct 14, 2025
e71b7f9
update lakefile.toml: this will break nightly-testing for now
kim-em Oct 14, 2025
68b95e6
bump
kim-em Oct 17, 2025
7e4cc4f
delete
kim-em Oct 17, 2025
e5249f6
Merge main into nightly-testing
Oct 17, 2025
730a40c
Merge main into nightly-testing
Oct 17, 2025
fb466a4
Merge main into nightly-testing
Oct 17, 2025
2018c53
Merge main into nightly-testing
Oct 17, 2025
28b88e6
chore: bump to nightly-2025-10-17 with mathlib at nightly-testing-202…
Oct 17, 2025
54b093a
bump Mathlib
kim-em Oct 20, 2025
fc0add3
bump mathlib
kim-em Oct 20, 2025
58a9400
adaptation note
kim-em Oct 20, 2025
35b39ab
fix grind problems in LambdaCalculus
kim-em Oct 20, 2025
d7eff49
more fixes in LambdaCalculus
kim-em Oct 20, 2025
9417eaf
another append_assoc
kim-em Oct 20, 2025
2921a04
grind failures
chenson2018 Oct 20, 2025
a414f28
specify patterns
chenson2018 Oct 20, 2025
7f94c9e
Merge main into nightly-testing
Oct 20, 2025
a3d2d67
Merge main into nightly-testing
Oct 20, 2025
b949f08
Merge main into nightly-testing
Oct 20, 2025
74a3954
chore: bump to nightly-2025-10-20 with mathlib at nightly-testing-202…
Oct 20, 2025
e760a7d
Merge main into nightly-testing
Oct 20, 2025
c458a34
chore: bump to nightly-2025-10-21 with mathlib at nightly-testing-202…
Oct 21, 2025
656f20b
fix incorrect merge
chenson2018 Oct 21, 2025
fa7421c
set toolchain to a nightly
kim-em Oct 21, 2025
f3b5d23
Merge main into nightly-testing
Oct 22, 2025
04cf20d
Merge main into nightly-testing
Oct 22, 2025
fa30df8
Merge main into nightly-testing
Oct 23, 2025
6e3b5d6
Merge main into nightly-testing
Oct 24, 2025
3c375db
chore: bump to nightly-2025-10-26 with mathlib at nightly-testing-202…
Oct 26, 2025
a0b567e
chore: bump to nightly-2025-10-27 with mathlib at nightly-testing-202…
Oct 27, 2025
fb8a466
Merge main into nightly-testing
Oct 27, 2025
d4eaae7
Merge main into nightly-testing
Oct 28, 2025
ebfc8bb
changes to multigoal linter
chenson2018 Oct 28, 2025
b627a5b
replace Finset.toSet
chenson2018 Oct 28, 2025
a196fdf
chore: bump to nightly-2025-10-29 with mathlib at nightly-testing-202…
Oct 29, 2025
40e8118
Merge main into nightly-testing
Oct 29, 2025
282e23c
Merge main into nightly-testing
Oct 29, 2025
2d83b2d
chore: bump to nightly-2025-10-30 with mathlib at nightly-testing-202…
Oct 30, 2025
ed67926
lint
chenson2018 Oct 31, 2025
adc2f7b
chore: bump to nightly-2025-10-31 with mathlib at nightly-testing-202…
Oct 31, 2025
41a8511
changes we should take from main (from PRs)
chenson2018 Nov 1, 2025
e702c50
Merge main into nightly-testing
Nov 1, 2025
de55ae2
chore: bump to nightly-2025-11-05 with mathlib at nightly-testing-202…
Nov 5, 2025
c9f6083
chore: bump to nightly-2025-11-06 with mathlib at nightly-testing-202…
Nov 6, 2025
1c4e4f2
chore: bump to nightly-2025-11-08 with mathlib at nightly-testing-202…
Nov 8, 2025
d6495ea
Merge main into nightly-testing
Nov 9, 2025
19d2653
chore: bump to nightly-2025-11-10 with mathlib at nightly-testing-202…
Nov 10, 2025
3c0e4f5
more lint changes
chenson2018 Nov 10, 2025
55dd070
chore: bump to nightly-2025-11-11 with mathlib at nightly-testing-202…
Nov 11, 2025
3fa0b55
chore: bump to nightly-2025-11-12 with mathlib at nightly-testing-202…
Nov 12, 2025
f135d38
Merge main into nightly-testing
Nov 12, 2025
c29367b
chore: bump to nightly-2025-11-13 with mathlib at nightly-testing-202…
Nov 13, 2025
e6aebd7
Merge main into nightly-testing
Nov 13, 2025
5e5e0ea
Merge main into nightly-testing
Nov 14, 2025
c41245c
chore: bump to nightly-2025-11-14 with mathlib at nightly-testing-202…
Nov 14, 2025
997971a
Merge main into nightly-testing
Nov 14, 2025
13cdf35
chore: bump to nightly-2025-11-15 with mathlib at nightly-testing-202…
Nov 15, 2025
813cfd3
Merge main into nightly-testing
Nov 15, 2025
bfc69ba
Merge main into nightly-testing
Nov 17, 2025
b367da2
Merge main into nightly-testing
Nov 17, 2025
222d5ab
chore: bump to nightly-2025-11-17 with mathlib at nightly-testing-202…
Nov 17, 2025
0e41c2f
Merge main into nightly-testing
Nov 17, 2025
2d54f98
Merge main into nightly-testing
Nov 18, 2025
520605c
Merge main into nightly-testing
Nov 18, 2025
4142d49
chore: bump to nightly-2025-11-18 with mathlib at nightly-testing-202…
Nov 18, 2025
985f4d5
FinFun grind failure
chenson2018 Nov 19, 2025
72c88be
Merge main into nightly-testing
Nov 19, 2025
3431d10
fix
kim-em Nov 19, 2025
53ba77f
Merge branch 'nightly-testing' of github.com:leanprover/cslib into ni…
kim-em Nov 19, 2025
88a38b0
remove redundant have
kim-em Nov 19, 2025
015da0d
Auto-resolved conflicts in lean-toolchain and lake-manifest.json
Nov 19, 2025
7fab2e7
chore: adaptations for nightly-2025-11-18
Nov 19, 2025
e3ff8df
Merge main into nightly-testing
Nov 19, 2025
72b08bc
Merge main into nightly-testing
Nov 19, 2025
02067a4
Merge main into nightly-testing
Nov 19, 2025
094eb8a
chore: bump to nightly-2025-11-20 with mathlib at nightly-testing-202…
Nov 20, 2025
3c82c96
destructuring needed in map_val_mem
chenson2018 Nov 20, 2025
534e652
unused variable
chenson2018 Nov 20, 2025
8ce06df
linter
chenson2018 Nov 20, 2025
eee9160
Merge main into nightly-testing
Nov 20, 2025
9050896
lean-toolchain
kim-em Nov 20, 2025
b030a4f
Merge main into nightly-testing
Nov 21, 2025
afaea48
lint
chenson2018 Nov 21, 2025
8b4ede2
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Nov 21, 2025
4ab93be
chore: adaptations for nightly-2025-11-20
Nov 21, 2025
9de9d9d
Merge branch 'bump/nightly-2025-11-20' into nightly-testing
Nov 21, 2025
5287af4
chore: adaptations for nightly-2025-11-20 (#175)
Nov 21, 2025
81ad2f2
chore: bump to nightly-2025-11-21 with mathlib at nightly-testing-202…
Nov 21, 2025
face112
Merge main into nightly-testing
Nov 22, 2025
1fbde58
conflict in lakefile
chenson2018 Nov 22, 2025
0dbb129
chore: adaptations for nightly-2025-11-21
chenson2018 Nov 22, 2025
53e2996
chore: adaptations for nightly-2025-11-21 (#177)
chenson2018 Nov 22, 2025
1346cb3
chore: adaptations for nightly-2025-11-21
kim-em Nov 23, 2025
6fc78ed
merge
kim-em Nov 23, 2025
6c09734
chore: adaptations for nightly-2025-11-21
kim-em Nov 23, 2025
9feef00
Merge branch 'bump/nightly-2025-11-21' into nightly-testing
kim-em Nov 23, 2025
9d3430a
chore: adaptations for nightly-2025-11-21 (#179)
kim-em Nov 23, 2025
94fcc38
chore: bump to nightly-2025-11-23 with mathlib at nightly-testing-202…
Nov 23, 2025
668b7d3
lint, make a proof explicit
chenson2018 Nov 23, 2025
0ca986f
Merge main into nightly-testing
Nov 24, 2025
5bcbb84
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Nov 24, 2025
d8b5872
chore: adaptations for nightly-2025-11-23
Nov 24, 2025
468cfbe
Merge branch 'bump/nightly-2025-11-23' into nightly-testing
Nov 24, 2025
ef2bdcf
chore: adaptations for nightly-2025-11-23 (#182)
Nov 24, 2025
8bf8c91
chore: bump to nightly-2025-11-24 with mathlib at nightly-testing-202…
Nov 24, 2025
c39aa90
chore: adaptations for nightly-2025-11-24
Nov 24, 2025
062288d
chore: adaptations for nightly-2025-11-24 (#183)
Nov 24, 2025
e6609ae
chore: bump to nightly-2025-11-25 with mathlib at nightly-testing-202…
Nov 25, 2025
9792c2a
Merge main into nightly-testing
Nov 27, 2025
82f9811
chore: bump to nightly-2025-11-27 with mathlib at nightly-testing-202…
Nov 28, 2025
2165ef3
linter
chenson2018 Nov 28, 2025
cbca973
shake
chenson2018 Nov 28, 2025
991b29d
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Nov 28, 2025
72275af
chore: adaptations for nightly-2025-11-27
Nov 28, 2025
0c679d6
chore: adaptations for nightly-2025-11-27 (#190)
Nov 28, 2025
143dd61
Merge main into nightly-testing
Nov 28, 2025
7b57d7c
Merge main into nightly-testing
Nov 29, 2025
5b9ea98
chore: bump to nightly-2025-12-01 with mathlib at nightly-testing-202…
Dec 1, 2025
2feaf8c
disable unusedDecidableInType linter in files using free_union
chenson2018 Dec 1, 2025
0e83cad
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Dec 1, 2025
384dcd5
chore: adaptations for nightly-2025-12-01
Dec 1, 2025
9302029
chore: adaptations for nightly-2025-12-01 (#193)
Dec 1, 2025
ee3eb3c
chore: bump to nightly-2025-12-04 with mathlib at nightly-testing-202…
Dec 4, 2025
f18d242
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Dec 4, 2025
2ad15dc
chore: adaptations for nightly-2025-12-04
Dec 4, 2025
c04534c
chore: adaptations for nightly-2025-12-04 (#197)
Dec 4, 2025
71d7f40
Merge main into nightly-testing
Dec 4, 2025
c8f3a75
chore: bump to nightly-2025-12-05 with mathlib at nightly-testing-202…
Dec 5, 2025
63d6f77
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Dec 5, 2025
93c5502
chore: adaptations for nightly-2025-12-05
Dec 5, 2025
30b9c10
chore: adaptations for nightly-2025-12-05 (#200)
Dec 5, 2025
4484b77
Merge main into nightly-testing
Dec 5, 2025
e0044ef
Merge main into nightly-testing
Dec 6, 2025
bad48f8
chore: bump to nightly-2025-12-07 with mathlib at nightly-testing-202…
Dec 7, 2025
2501a6c
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Dec 7, 2025
808dbc3
chore: adaptations for nightly-2025-12-07
Dec 7, 2025
2a6287a
chore: adaptations for nightly-2025-12-07 (#204)
Dec 7, 2025
162fdf5
chore: bump to nightly-2025-12-08 with mathlib at nightly-testing-202…
Dec 8, 2025
4f8f0d4
chore: adaptations for nightly-2025-12-08
Dec 8, 2025
2323933
chore: adaptations for nightly-2025-12-08 (#205)
Dec 8, 2025
c173c07
chore: bump to nightly-2025-12-09 with mathlib at nightly-testing-202…
Dec 9, 2025
779f68d
chore: bump to nightly-2025-12-10 with mathlib at nightly-testing-202…
Dec 10, 2025
94fa520
Merge main into nightly-testing
Dec 10, 2025
9cfb7d3
chore: fix failures caused by PR mathlib#31247 (#209)
ctchou Dec 11, 2025
f4c21d2
Merge remote-tracking branch 'origin/main' into bump/v4.27.0
Dec 11, 2025
aa52a60
chore: adaptations for nightly-2025-12-10
Dec 11, 2025
9387773
Merge main into nightly-testing
Dec 13, 2025
e3aaeb1
Merge main into nightly-testing
Dec 13, 2025
3d53956
chore: bump to nightly-2025-12-14 with mathlib at nightly-testing-202…
Dec 14, 2025
f790789
Merge main into nightly-testing
Dec 14, 2025
757e35e
chore: adaptations for nightly-2025-12-14
Dec 14, 2025
0ee5076
Merge branch 'bump/nightly-2025-12-14' into nightly-testing
Dec 14, 2025
d7ddd27
Merge main into nightly-testing
Dec 15, 2025
b17e81b
chore: bump to nightly-2025-12-15 with mathlib at nightly-testing-202…
Dec 15, 2025
6780328
chore: adaptations for nightly-2025-12-15
Dec 15, 2025
c896b05
Merge main into nightly-testing
Dec 15, 2025
8f280a0
Merge main into nightly-testing
Dec 16, 2025
c194385
Merge main into nightly-testing
Dec 16, 2025
47e3632
chore: bump to nightly-2025-12-16 with mathlib at nightly-testing-202…
Dec 16, 2025
4d0ffd4
chore: adaptations for nightly-2025-12-16
Dec 16, 2025
bfeaff1
Merge main into nightly-testing
Dec 17, 2025
6296f6c
chore: bump to nightly-2025-12-17 with mathlib at nightly-testing-202…
Dec 17, 2025
53e051b
chore: adaptations for nightly-2025-12-17
Dec 17, 2025
f549e65
Merge main into nightly-testing
Dec 18, 2025
b43b1a5
Merge main into nightly-testing
Dec 19, 2025
2cde5db
chore: bump to nightly-2025-12-21 with mathlib at nightly-testing-202…
Dec 21, 2025
c1881d5
deprecations
chenson2018 Dec 21, 2025
ed6795c
grind lints
chenson2018 Dec 21, 2025
88421bd
chore: adaptations for nightly-2025-12-21
Dec 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cslib/Languages/CombinatoryLogic/Confluence.lean
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ theorem reflTransGen_parallelReduction_mRed :
Relation.ReflTransGen ParallelReduction = RedSKI.MRed := by
ext a b
constructor
· apply Relation.reflTransGen_minimal
· apply Relation.reflTransGen_of_transitive_reflexive
· exact fun _ => by rfl
· exact Relation.transitive_reflTransGen
· exact @mRed_of_parallelReduction
· apply Relation.reflTransGen_minimal
· apply Relation.reflTransGen_of_transitive_reflexive
· exact Relation.reflexive_reflTransGen
· exact Relation.transitive_reflTransGen
· exact fun a a' h => Relation.ReflTransGen.single (parallelReduction_of_red h)
Expand Down
2 changes: 2 additions & 0 deletions CslibTests/GrindLint.lean
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ open_scoped_all Cslib
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Fsub.Typing.sub
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Fsub.Typing.tapp
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Untyped.Term.para_subst
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Untyped.Term.FullBeta.redex_app_l_cong
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Untyped.Term.FullBeta.redex_app_r_cong
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Untyped.Term.subst_intro
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Fsub.Env.Wf.sub
#grind_lint skip Cslib.LambdaCalculus.LocallyNameless.Fsub.Env.Wf.ty
Expand Down
6 changes: 3 additions & 3 deletions lake-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"type": "git",
"subDir": null,
"scope": "",
"rev": "178f5fddb4143ecaf7f73e9ec8ef61518323f4a1",
"rev": "79e7204347080c40edc253bd90a46e3a93d94428",
"name": "mathlib",
"manifestFile": "lake-manifest.json",
"inputRev": "nightly-testing-2025-12-17",
"inputRev": "nightly-testing-2025-12-21",
"inherited": false,
"configFile": "lakefile.lean"},
{"url": "https://github.com/leanprover-community/plausible",
Expand Down Expand Up @@ -75,7 +75,7 @@
"type": "git",
"subDir": null,
"scope": "leanprover-community",
"rev": "a66b2895e7d2a3246bc08054eb88b423e3af909a",
"rev": "a1b074f50773cd383d02ca57d311cc5c44362596",
"name": "batteries",
"manifestFile": "lake-manifest.json",
"inputRev": "nightly-testing",
Expand Down
2 changes: 1 addition & 1 deletion lakefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ weak.linter.allScriptsDocumented = false
[[require]]
name = "mathlib"
git = "https://github.com/leanprover-community/mathlib4-nightly-testing"
rev = "nightly-testing-2025-12-17"
rev = "nightly-testing-2025-12-21"

[[lean_lib]]
name = "Cslib"
Expand Down
2 changes: 1 addition & 1 deletion lean-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
leanprover/lean4:nightly-2025-12-17
leanprover/lean4:nightly-2025-12-21