Skip to content

Commit 43a178f

Browse files
committed
Merge remote-tracking branch 'upstream/master' into finite-etale-sepclosed
2 parents f3e06e8 + dd46575 commit 43a178f

298 files changed

Lines changed: 3064 additions & 1656 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/get-mathlib-ci/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
# Default pinned commit used by workflows unless they explicitly override.
1111
# Update this ref as needed to pick up changes to mathlib-ci scripts
1212
# This is also updated automatically by .github/workflows/update_dependencies.yml
13-
default: 8c3d31d2beba80d86de30b6ccd373d2c3a76b26e
13+
default: ca86f6900d53e503e28ec1cfa2bff2f505474553
1414
path:
1515
description: Checkout destination path.
1616
required: false

Archive/Imo/Imo2002Q3.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Mathlib.RingTheory.Polynomial.Content
1212
Find all pairs of positive integers $m,n ≥ 3$ for which there exist infinitely many
1313
positive integers $a$ such that $(a^m+a-1) / (a^n+a^2-1)$ is itself an integer.
1414
15-
# Solution
15+
## Solution
1616
1717
It suffices to find $(m,n)$ pairs for which $a^n+a^2-1 ∣ a^m+a-1$, where both sides are viewed as
1818
polynomials in $a$. This automatically gives $n ≤ m$, so we have

Archive/Imo/Imo2010Q5.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Determine if there exists a finite sequence of operations of the allowed types,
2525
that the five boxes $B_1, B_2, B_3, B_4, B_5$ become empty, while box $B_6$ contains exactly
2626
$2010^{2010^{2010}}$ coins.
2727
28-
# Solution
28+
## Solution
2929
3030
We follow the solution from https://web.evanchen.cc/exams/IMO-2010-notes.pdf.
3131

Mathlib.lean

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,9 +694,11 @@ public import Mathlib.Algebra.Jordan.Basic
694694
public import Mathlib.Algebra.Lie.Abelian
695695
public import Mathlib.Algebra.Lie.AdjointAction.Basic
696696
public import Mathlib.Algebra.Lie.AdjointAction.Derivation
697+
public import Mathlib.Algebra.Lie.AdjointAction.JordanChevalley
697698
public import Mathlib.Algebra.Lie.BaseChange
698699
public import Mathlib.Algebra.Lie.Basic
699700
public import Mathlib.Algebra.Lie.Basis
701+
public import Mathlib.Algebra.Lie.CartanCriterion
700702
public import Mathlib.Algebra.Lie.CartanExists
701703
public import Mathlib.Algebra.Lie.CartanMatrix
702704
public import Mathlib.Algebra.Lie.CartanSubalgebra
@@ -1568,6 +1570,7 @@ public import Mathlib.AlgebraicTopology.SimplicialSet.Subdivision
15681570
public import Mathlib.AlgebraicTopology.SimplicialSet.TopAdj
15691571
public import Mathlib.AlgebraicTopology.SingularHomology.Basic
15701572
public import Mathlib.AlgebraicTopology.SingularHomology.HomotopyInvariance
1573+
public import Mathlib.AlgebraicTopology.SingularHomology.HomotopyInvarianceTopCat
15711574
public import Mathlib.AlgebraicTopology.SingularSet
15721575
public import Mathlib.AlgebraicTopology.TopologicalSimplex
15731576
public import Mathlib.Analysis.AbsoluteValue.Equivalence
@@ -3514,9 +3517,10 @@ public import Mathlib.Combinatorics.SimpleGraph.Bipartite
35143517
public import Mathlib.Combinatorics.SimpleGraph.Cayley
35153518
public import Mathlib.Combinatorics.SimpleGraph.Circulant
35163519
public import Mathlib.Combinatorics.SimpleGraph.Clique
3520+
public import Mathlib.Combinatorics.SimpleGraph.Coloring.Constructions
3521+
public import Mathlib.Combinatorics.SimpleGraph.Coloring.EdgeLabeling
35173522
public import Mathlib.Combinatorics.SimpleGraph.Coloring.VertexColoring
35183523
public import Mathlib.Combinatorics.SimpleGraph.CompleteMultipartite
3519-
public import Mathlib.Combinatorics.SimpleGraph.ConcreteColorings
35203524
public import Mathlib.Combinatorics.SimpleGraph.Connectivity.Connected
35213525
public import Mathlib.Combinatorics.SimpleGraph.Connectivity.EdgeConnectivity
35223526
public import Mathlib.Combinatorics.SimpleGraph.Connectivity.Finite
@@ -3528,7 +3532,6 @@ public import Mathlib.Combinatorics.SimpleGraph.DegreeSum
35283532
public import Mathlib.Combinatorics.SimpleGraph.DeleteEdges
35293533
public import Mathlib.Combinatorics.SimpleGraph.Density
35303534
public import Mathlib.Combinatorics.SimpleGraph.Diam
3531-
public import Mathlib.Combinatorics.SimpleGraph.EdgeLabeling
35323535
public import Mathlib.Combinatorics.SimpleGraph.Ends.Defs
35333536
public import Mathlib.Combinatorics.SimpleGraph.Ends.Properties
35343537
public import Mathlib.Combinatorics.SimpleGraph.Extremal.Basic
@@ -3595,11 +3598,13 @@ public import Mathlib.Computability.Language
35953598
public import Mathlib.Computability.MyhillNerode
35963599
public import Mathlib.Computability.NFA
35973600
public import Mathlib.Computability.Partrec
3601+
public import Mathlib.Computability.PartrecBasis
35983602
public import Mathlib.Computability.PartrecCode
35993603
public import Mathlib.Computability.PostTuringMachine
36003604
public import Mathlib.Computability.Primrec
36013605
public import Mathlib.Computability.Primrec.Basic
36023606
public import Mathlib.Computability.Primrec.List
3607+
public import Mathlib.Computability.RE
36033608
public import Mathlib.Computability.RecursiveIn
36043609
public import Mathlib.Computability.Reduce
36053610
public import Mathlib.Computability.RegularExpressions
@@ -4333,6 +4338,7 @@ public import Mathlib.Dynamics.Ergodic.Function
43334338
public import Mathlib.Dynamics.Ergodic.MeasurePreserving
43344339
public import Mathlib.Dynamics.Ergodic.RadonNikodym
43354340
public import Mathlib.Dynamics.FixedPoints.Basic
4341+
public import Mathlib.Dynamics.FixedPoints.Defs
43364342
public import Mathlib.Dynamics.FixedPoints.Prufer
43374343
public import Mathlib.Dynamics.FixedPoints.Topology
43384344
public import Mathlib.Dynamics.Flow
@@ -7085,8 +7091,8 @@ public import Mathlib.Tactic.Linarith.Parsing
70857091
public import Mathlib.Tactic.Linarith.Preprocessing
70867092
public import Mathlib.Tactic.Linarith.Verification
70877093
public import Mathlib.Tactic.LinearCombination
7088-
public import Mathlib.Tactic.LinearCombination'
70897094
public import Mathlib.Tactic.LinearCombination.Lemmas
7095+
public import Mathlib.Tactic.LinearCombinationPrime
70907096
public import Mathlib.Tactic.Linter
70917097
public import Mathlib.Tactic.Linter.CommandRanges
70927098
public import Mathlib.Tactic.Linter.CommandStart
@@ -7859,6 +7865,7 @@ public import Mathlib.Topology.Sheaves.Skyscraper
78597865
public import Mathlib.Topology.Sheaves.Stalks
78607866
public import Mathlib.Topology.ShrinkingLemma
78617867
public import Mathlib.Topology.Sion
7868+
public import Mathlib.Topology.SmallInductiveDimension
78627869
public import Mathlib.Topology.Sober
78637870
public import Mathlib.Topology.Specialization
78647871
public import Mathlib.Topology.Spectral.Basic

Mathlib/Algebra/Algebra/Basic.lean

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ end SubsemiringAlgebra
138138
def algebraMapSubmonoid (S : Type*) [Semiring S] [Algebra R S] (M : Submonoid R) : Submonoid S :=
139139
M.map (algebraMap R S)
140140

141-
theorem mem_algebraMapSubmonoid_of_mem {S : Type*} [Semiring S] [Algebra R S] {M : Submonoid R}
141+
variable {S : Type*} [Semiring S] [Algebra R S]
142+
143+
theorem mem_algebraMapSubmonoid_of_mem {M : Submonoid R}
142144
(x : M) : algebraMap R S x ∈ algebraMapSubmonoid S M :=
143145
Set.mem_image_of_mem (algebraMap R S) x.2
144146

@@ -147,10 +149,15 @@ lemma algebraMapSubmonoid_self (M : Submonoid R) : Algebra.algebraMapSubmonoid R
147149
Submonoid.map_id M
148150

149151
@[simp]
150-
lemma algebraMapSubmonoid_powers {S : Type*} [Semiring S] [Algebra R S] (r : R) :
152+
lemma algebraMapSubmonoid_powers (r : R) :
151153
Algebra.algebraMapSubmonoid S (.powers r) = Submonoid.powers (algebraMap R S r) := by
152154
simp [Algebra.algebraMapSubmonoid]
153155

156+
lemma algebraMapSubmonoid_isUnit_le :
157+
algebraMapSubmonoid S (IsUnit.submonoid R) ≤ IsUnit.submonoid S := by
158+
rintro x ⟨y, hy, rfl⟩
159+
exact hy.map _
160+
154161
end Semiring
155162

156163
section CommSemiring

Mathlib/Algebra/Category/AlgCat/Limits.lean

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ instance limitAlgebra :
6767
Algebra R (Types.Small.limitCone (F ⋙ forget (AlgCat.{w} R))).pt :=
6868
inferInstanceAs <| Algebra R (Shrink (sectionsSubalgebra F))
6969

70-
#adaptation_note /-- After nightly-2026-02-23 we need this to avoid timeouts. -/
7170
set_option backward.isDefEq.respectTransparency false in
7271
/-- `limit.π (F ⋙ forget (AlgCat R)) j` as an `AlgHom`. -/
7372
def limitπAlgHom (j) :

Mathlib/Algebra/Category/ContinuousCohomology/Basic.lean

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ def kerHomogeneousCochainsZeroEquiv
199199
continuous_invFun := continuous_induced_rng.mpr
200200
(continuous_induced_rng.mpr ((ContinuousLinearMap.const R G).cont.comp continuous_subtype_val))
201201

202-
#adaptation_note /-- After nightly-2026-02-23 we need this to avoid timeouts. -/
203202
set_option backward.isDefEq.respectTransparency false in
204203
open ShortComplex HomologyData in
205204
/-- `H⁰_cont(G, X) ≅ Xᴳ`. -/

Mathlib/Algebra/Category/Grp/AB.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public import Mathlib.CategoryTheory.Limits.FunctorCategory.EpiMono
1515
# AB axioms for the category of abelian groups
1616
1717
This file proves that the category of abelian groups satisfies Grothendieck's axioms AB5, AB4, and
18-
AB4*.
18+
AB4\*.
1919
-/
2020

2121
@[expose] public section

Mathlib/Algebra/Category/ModuleCat/AB.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public import Mathlib.CategoryTheory.Abelian.GrothendieckCategory.Basic
1414
# AB axioms in module categories
1515
1616
This file proves that the category of modules over a ring satisfies Grothendieck's axioms AB5, AB4,
17-
and AB4*. Further, it proves that `R` is a separator in the category of modules over `R`, and
17+
and AB4\*. Further, it proves that `R` is a separator in the category of modules over `R`, and
1818
concludes that this category is Grothendieck abelian.
1919
-/
2020

Mathlib/Algebra/Category/ModuleCat/Basic.lean

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -509,26 +509,10 @@ def smulNatTrans : R →+* End (forget₂ (ModuleCat R) AddCommGrpCat) where
509509
toFun r :=
510510
{ app := fun M => M.smul r
511511
naturality := fun _ _ _ => smul_naturality _ r }
512-
map_one' := NatTrans.ext (by
513-
#adaptation_note /-- Prior to https://github.com/leanprover/lean4/pull/12244
514-
this was just `cat_disch`. -/
515-
simp +instances only [forget₂_obj, map_one, End.one_def]
516-
cat_disch)
517-
map_zero' := NatTrans.ext (by
518-
#adaptation_note /-- Prior to https://github.com/leanprover/lean4/pull/12244
519-
this was just `cat_disch`. -/
520-
simp +instances only [forget₂_obj, map_zero]
521-
cat_disch)
522-
map_mul' _ _ := NatTrans.ext (by
523-
#adaptation_note /-- Prior to https://github.com/leanprover/lean4/pull/12244
524-
this was just `cat_disch`. -/
525-
simp +instances only [forget₂_obj, map_mul, End.mul_def]
526-
cat_disch)
527-
map_add' _ _ := NatTrans.ext (by
528-
#adaptation_note /-- Prior to https://github.com/leanprover/lean4/pull/12244
529-
this was just `cat_disch`. -/
530-
simp +instances only [forget₂_obj, map_add]
531-
cat_disch)
512+
map_one' := by cat_disch
513+
map_zero' := by cat_disch
514+
map_mul' _ _ := by cat_disch
515+
map_add' _ _ := by cat_disch
532516

533517
/-- Given `A : AddCommGrpCat` and a ring morphism `R →+* End A`, this is a type synonym
534518
for `A`, on which we shall define a structure of `R`-module. -/

0 commit comments

Comments
 (0)