Skip to content

Commit 1f601a2

Browse files
chore: bump mathlib to 8589236, fix breaking changes (#628)
Bump `mathlib` dependency to [8589236](leanprover-community/mathlib4@8589236): chore: move Data/Nat/Lattice to Order (#39990) (2026-06-09) Previously at: [d90090f](leanprover-community/mathlib4@d90090f): chore: bump toolchain to v4.31.0-rc2 (#40358) (2026-06-08) Closes #627 Failure log from the validation run: [download](https://github.com/leanprover-community/downstream-reports/actions/runs/27253259444/artifacts/7526847935) _(link expires after 1 year)_ --- This PR bumps `mathlib` to an identified incompatible (first-known-bad) commit (`8589236`) so you can reproduce and fix the incompatibility locally by checking out this branch. _Opened automatically by [downstream-reports/track-incompatibility](https://github.com/leanprover-community/downstream-reports) via [this workflow run](https://github.com/leanprover/cslib/actions/runs/27305770390)._ --------- Co-authored-by: mathlib-nightly-testing[bot] <mathlib-nightly-testing[bot]@users.noreply.github.com> Co-authored-by: Chris Henson <chrishenson.net@gmail.com>
1 parent 616e04b commit 1f601a2

11 files changed

Lines changed: 33 additions & 37 deletions

File tree

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
### Area access
1313
# Each area maintainer has access to parts that pertain them. They get automatically asked for
1414
# reviewing new PRs that touch those areas.
15-
/Cslib/Algorithms/ @fmontesi @sorrachai
15+
/Cslib/Algorithms/ @fmontesi @sorrachai @chenson2018
1616
/Cslib/Foundations/Logic/ @arademaker @fmontesi @chenson2018
1717
/Cslib/Logics/ @arademaker @fmontesi @chenson2018
1818
/Cslib/Languages/LambdaCalculus/ @chenson2018 @fmontesi

.github/workflows/lean_action_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
build-args: "--wfail --iofail"
2424
test-args: "--wfail --iofail"
25-
- name: "lake exe mk_all --check --module"
25+
- name: "lake exe mk_all --check"
2626
run: |
2727
set -e
28-
lake exe mk_all --check --module
28+
lake exe mk_all --check
2929
#- name: "lake shake"
3030
# run: |
3131
# set -e

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ CSLib uses a number of linters, mostly inherited from Batteries and Mathlib. The
126126
## Imports
127127

128128
There is a also a test that [Cslib.lean](/Cslib.lean) imports all files. You can ensure this by
129-
running `lake exe mk_all --module` locally, which will make the required changes.
129+
running `lake exe mk_all` locally, which will make the required changes.
130130

131131
CSLib tests for minimized imports using `lake shake --add-public --keep-implied --keep-prefix`, which also comes with a `--fix` option.
132132
See `lake shake --help` for the special comment syntax used to preserve imports required for tactics or typeclasses.

Cslib/Algorithms/Lean/MergeSort/MergeSort.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module
88

99
public import Cslib.Algorithms.Lean.TimeM
1010
public import Mathlib.Data.Nat.Cast.Order.Ring
11-
public import Mathlib.Data.Nat.Lattice
11+
public import Mathlib.Order.Lattice.Nat
1212
public import Mathlib.Data.Nat.Log
1313

1414
/-!

Cslib/Foundations/Combinatorics/InfiniteGraphRamsey.lean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ private lemma goodSelection_exists (ivs : InfVSet Vertex) :
6969
obtain ⟨v, h_v⟩ := Set.Infinite.nonempty ivs.inf
7070
let f u := color {v, u}
7171
obtain ⟨c, vs, h_inf, h_vs, h_col⟩ := infinite_pigeonhole_principle f <|
72-
Set.Infinite.diff ivs.inf (finite_singleton v)
73-
simp only [subset_diff] at h_vs
72+
Set.Infinite.sdiff ivs.inf (finite_singleton v)
73+
simp only [subset_sdiff] at h_vs
7474
let ivs' := InfVSet.mk vs h_inf
7575
use {vs := ivs', v := v, c := c}
7676
grind [GoodSelection]

Cslib/Foundations/Data/OmegaSequence/Init.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module
99
public import Cslib.Foundations.Data.OmegaSequence.Defs
1010
public import Mathlib.Algebra.Order.Group.Nat
1111
public import Mathlib.Algebra.Order.Sub.Basic
12-
public import Mathlib.Data.Nat.Lattice
12+
public import Mathlib.Order.Lattice.Nat
1313

1414
/-!
1515
# ω-sequences a.k.a. infinite sequences

Cslib/MachineLearning/PACLearning/Defs.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ theorem error_map_eq_hypothesisError (P : Measure α) (h c : Set α)
517517
rw [Measure.map_apply_of_aemeasurable hf.aemeasurable]
518518
· congr 1; ext x
519519
simp only [Set.mem_preimage, Set.mem_setOf_eq, symmDiff_def, sup_eq_union,
520-
Set.mem_union, Set.mem_diff]
520+
Set.mem_union, Set.mem_sdiff]
521521
by_cases hx : x ∈ h <;> by_cases hcx : x ∈ c <;> simp_all
522522
· convert (hh.prod (measurableSet_singleton false)).union
523523
(hh.compl.prod (measurableSet_singleton true)) using 1

Cslib/MachineLearning/PACLearning/VCDimension.lean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ theorem SetShatters.subset {C : ConceptClass α Bool} {W V : Set α}
5959
(hW : SetShatters C W) (hVW : V ⊆ W) : SetShatters C V := by
6060
intro V' hV'V
6161
obtain ⟨c, hc, hc_eq⟩ := hW (V' ∪ (W \ V))
62-
(union_subset (hV'V.trans hVW) diff_subset)
62+
(union_subset (hV'V.trans hVW) sdiff_subset)
6363
refine ⟨c, hc, ?_⟩
6464
rw [show V = W ∩ V from (inter_eq_self_of_subset_right hVW).symm,
6565
← inter_assoc, hc_eq]
6666
ext x
67-
simp only [mem_inter_iff, mem_union, mem_diff]
67+
simp only [mem_inter_iff, mem_union, mem_sdiff]
6868
refine ⟨?_, fun h => ⟨Or.inl h, hV'V h⟩⟩
6969
rintro ⟨h1 | ⟨_, h2⟩, h3⟩
7070
· exact h1

CslibTests.lean

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
module -- shake: keep-all --deprecated_module: ignore
2-
3-
public import CslibTests.Bisimulation
4-
public import CslibTests.CCS
5-
public import CslibTests.CLL
6-
public import CslibTests.DFA
7-
public import CslibTests.FreeMonad
8-
public import CslibTests.GrindLint
9-
public import CslibTests.HML
10-
public import CslibTests.HasFresh
11-
public import CslibTests.ImportWithMathlib
12-
public import CslibTests.LTS
13-
public import CslibTests.LambdaCalculus
14-
public import CslibTests.MLL
15-
public import CslibTests.Reduction
1+
import CslibTests.Bisimulation
2+
import CslibTests.CCS
3+
import CslibTests.CLL
4+
import CslibTests.DFA
5+
import CslibTests.FreeMonad
6+
import CslibTests.GrindLint
7+
import CslibTests.HML
8+
import CslibTests.HasFresh
9+
import CslibTests.ImportWithMathlib
10+
import CslibTests.LTS
11+
import CslibTests.LambdaCalculus
12+
import CslibTests.MLL
13+
import CslibTests.Reduction

lake-manifest.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"type": "git",
66
"subDir": null,
77
"scope": "leanprover-community",
8-
"rev": "d90090f647cae4f4ad4da99c0ac8bab2ca8c34ab",
8+
"rev": "8589236b8b8cc82492e3306df39c0fb308e0523c",
99
"name": "mathlib",
1010
"manifestFile": "lake-manifest.json",
11-
"inputRev": "d90090f647cae4f4ad4da99c0ac8bab2ca8c34ab",
11+
"inputRev": "8589236b8b8cc82492e3306df39c0fb308e0523c",
1212
"inherited": false,
1313
"configFile": "lakefile.lean"},
1414
{"url": "https://github.com/leanprover-community/plausible",
@@ -48,7 +48,7 @@
4848
"rev": "1537e3fc7e680d64e06fe5fb95c4c9edee7941c2",
4949
"name": "proofwidgets",
5050
"manifestFile": "lake-manifest.json",
51-
"inputRev": "v0.0.101",
51+
"inputRev": "main",
5252
"inherited": true,
5353
"configFile": "lakefile.lean"},
5454
{"url": "https://github.com/leanprover-community/aesop",
@@ -58,7 +58,7 @@
5858
"rev": "7897ea6e5cfc6522d355083bdfa798377ab35e11",
5959
"name": "aesop",
6060
"manifestFile": "lake-manifest.json",
61-
"inputRev": "v4.31.0-rc2",
61+
"inputRev": "master",
6262
"inherited": true,
6363
"configFile": "lakefile.toml"},
6464
{"url": "https://github.com/leanprover-community/quote4",
@@ -68,17 +68,17 @@
6868
"rev": "94346b7b49c36ae871639d1434232f057c193d60",
6969
"name": "Qq",
7070
"manifestFile": "lake-manifest.json",
71-
"inputRev": "v4.31.0-rc2",
71+
"inputRev": "master",
7272
"inherited": true,
7373
"configFile": "lakefile.toml"},
7474
{"url": "https://github.com/leanprover-community/batteries",
7575
"type": "git",
7676
"subDir": null,
7777
"scope": "leanprover-community",
78-
"rev": "460b61adc7d183e43db2b99ac6c1dede9f7a76df",
78+
"rev": "0bbac0a875ac0fd9366cb5bd4211da92d960ac84",
7979
"name": "batteries",
8080
"manifestFile": "lake-manifest.json",
81-
"inputRev": "v4.31.0-rc2",
81+
"inputRev": "main",
8282
"inherited": true,
8383
"configFile": "lakefile.toml"},
8484
{"url": "https://github.com/leanprover/lean4-cli",

0 commit comments

Comments
 (0)