From 07e7c28707a88f32308388080bec5da77c6cbb0b Mon Sep 17 00:00:00 2001
From: Xavier Roblot <46200072+xroblot@users.noreply.github.com>
Date: Wed, 19 Aug 2026 14:57:33 +0200
Subject: [PATCH 1/3] 1st commit

---
 Mathlib.lean                                  |   1 +
 Mathlib/Algebra/QuadraticAlgebra/Discr.lean   | 112 +-----------------
 .../QuadraticAlgebra/Discriminant.lean        | 111 +++++++++++++++++
 3 files changed, 115 insertions(+), 109 deletions(-)
 create mode 100644 Mathlib/Algebra/QuadraticAlgebra/Discriminant.lean

diff --git a/Mathlib.lean b/Mathlib.lean
index 0c4411766caac2..81e0a493a9af54 100644
--- a/Mathlib.lean
+++ b/Mathlib.lean
@@ -1211,6 +1211,7 @@ public import Mathlib.Algebra.Prime.Lemmas
 public import Mathlib.Algebra.QuadraticAlgebra.Basic
 public import Mathlib.Algebra.QuadraticAlgebra.Defs
 public import Mathlib.Algebra.QuadraticAlgebra.Discr
+public import Mathlib.Algebra.QuadraticAlgebra.Discriminant
 public import Mathlib.Algebra.QuadraticAlgebra.NormDeterminant
 public import Mathlib.Algebra.QuadraticDiscriminant
 public import Mathlib.Algebra.Quandle
diff --git a/Mathlib/Algebra/QuadraticAlgebra/Discr.lean b/Mathlib/Algebra/QuadraticAlgebra/Discr.lean
index ead44154b53126..9f1c393f490117 100644
--- a/Mathlib/Algebra/QuadraticAlgebra/Discr.lean
+++ b/Mathlib/Algebra/QuadraticAlgebra/Discr.lean
@@ -1,111 +1,5 @@
-/-
-Copyright (c) 2026 Xavier Roblot. All rights reserved.
-Released under Apache 2.0 license as described in the file LICENSE.
-Authors: Xavier Roblot
--/
-module
+module -- shake: keep-all
 
-public import Mathlib.Algebra.QuadraticAlgebra.Basic
+public import Mathlib.Algebra.QuadraticAlgebra.Discriminant
 
-/-!
-# Discriminant of a quadratic algebra
-
-This file introduces the discriminant of a quadratic algebra `QuadraticAlgebra R a b` (with the
-convention `ω² = a + b·ω`), describes how it transforms under a change of generator, and derives,
-over a field, a criterion for `QuadraticAlgebra K a b` to be a field.
-
-## Main definitions
-
-* `QuadraticAlgebra.discr`: the discriminant `discr a b = b ^ 2 + 4 * a`.
-
-## Main results
-
-* `QuadraticAlgebra.discr_changeGenerator`: the discriminant scales by `u ^ 2` under the change
-  of generator `ω ↦ u • ω + k`.
-* `QuadraticAlgebra.exists_sq_eq_iff_isSquare_discr`: over a ring with `2` invertible,
-  `X ^ 2 - b * X - a` has a root iff `discr a b` is a square.
-* `QuadraticAlgebra.isField_iff_not_isSquare_discr`: over a field with `2 ≠ 0`,
-  `QuadraticAlgebra K a b` is a field iff `discr a b` is not a square.
--/
-
-@[expose] public section
-
-namespace QuadraticAlgebra
-
-variable {R : Type*}
-
-section discr
-
-/-- The discriminant of the quadratic algebra `QuadraticAlgebra R a b`, that is, the
-discriminant `b ^ 2 + 4 * a` of the polynomial `X ^ 2 - b * X - a`. -/
-def discr [CommSemiring R] (a b : R) : R := b ^ 2 + 4 * a
-
-theorem discr_def [CommSemiring R] (a b : R) : discr a b = b ^ 2 + 4 * a := rfl
-
-/-- Under the change of generator `ω ↦ u • ω + k` (see `QuadraticAlgebra.changeGenerator`), the
-discriminant is multiplied by `u ^ 2`. -/
-theorem discr_changeGenerator [CommRing R] (a b u k : R) :
-    discr (u ^ 2 * a - u * b * k - k ^ 2) (u * b + 2 * k) = u ^ 2 * discr a b := by
-  rw [discr_def, discr_def]; ring
-
-@[deprecated (since := "2026-08-14")] alias discr_map := discr_changeGenerator
-
-/-- The discriminant is the square of the different `ω - star ω`. -/
-theorem algebraMap_discr [CommRing R] (a b : R) :
-    algebraMap R (QuadraticAlgebra R a b) (discr a b) = (ω - star ω) ^ 2 := by
-  rw [discr_def]; ext <;> simp [sq] <;> ring
-
--- The `a = 1` case of `Mathlib.Algebra.QuadraticDiscriminant`, reproved to avoid its heavy
--- transitive import of `Mathlib.Order.Filter.AtTopBot.Field`.
-/-- If `2` is invertible, the polynomial `X ^ 2 - b * X - a` has a root if and only if the
-discriminant is a square. -/
-theorem exists_sq_eq_iff_isSquare_discr [CommRing R] [Invertible (2 : R)] {a b : R} :
-    (∃ r : R, r ^ 2 = a + b * r) ↔ IsSquare (discr a b) := by
-  rw [isSquare_iff_exists_sq]
-  have h2 := mul_invOf_self (2 : R)
-  refine ⟨fun ⟨r, hr⟩ ↦ ⟨2 * r - b, by rw [discr_def]; grind⟩, fun ⟨s, hs⟩ ↦ ⟨⅟2 * (b + s), ?_⟩⟩
-  rw [discr_def] at hs
-  grind
-
-end discr
-
-section field
-
--- This `Fact (∀ r, r ^ 2 ≠ …)` instance is the bridge that lets the `Field` instance on
--- `QuadraticAlgebra K a b` fire from `¬ IsSquare (discr a b)` alone (the `b = 0` bridge from
--- `¬ IsSquare a` lives in `Basic.lean`).
-instance {K : Type*} [Field K] {a b : K} [NeZero (2 : K)] [Fact (¬ IsSquare (discr a b))] :
-    Fact (∀ r : K, r ^ 2 ≠ a + b * r) :=
-  letI : Invertible (2 : K) := invertibleOfNonzero two_ne_zero
-  ⟨not_exists.mp <| exists_sq_eq_iff_isSquare_discr.not.mpr Fact.out⟩
-
-variable {K : Type*} [Field K]
-
-/-- If `discr a b` is a square, `QuadraticAlgebra K a b` is not a field. -/
-theorem not_isField_of_isSquare_discr [NeZero (2 : K)] {a b : K}
-    (h : IsSquare (discr a b)) : ¬ IsField (QuadraticAlgebra K a b) := by
-  let : Invertible (2 : K) := invertibleOfNonzero two_ne_zero
-  obtain ⟨r, hr⟩ := exists_sq_eq_iff_isSquare_discr.mpr h
-  intro hfield
-  let := hfield.toField
-  have : (⟨r, -1⟩ : QuadraticAlgebra K a b) ∈ nonZeroDivisors (QuadraticAlgebra K a b) := by
-    simp [mem_nonZeroDivisors_iff_ne_zero, QuadraticAlgebra.ext_iff]
-  rw [← norm_mem_nonZeroDivisors_iff, show norm ⟨r, -1⟩ = 0 by rw [norm_def]; grind] at this
-  exact zero_notMem_nonZeroDivisors this
-
-/-- If `2 ≠ 0` in the field `K`, `QuadraticAlgebra K a b` is a field iff `discr a b` is
-not a square. -/
-theorem isField_iff_not_isSquare_discr [NeZero (2 : K)] {a b : K} :
-    IsField (QuadraticAlgebra K a b) ↔ ¬ IsSquare (discr a b) := by
-  let : Invertible (2 : K) := invertibleOfNonzero two_ne_zero
-  refine ⟨fun hfield h ↦ not_isField_of_isSquare_discr h hfield, fun h ↦ ?_⟩
-  have : Fact (¬ IsSquare (discr a b)) := ⟨h⟩
-  exact Field.toIsField (QuadraticAlgebra K a b)
-
--- The general bridge makes the `Field` instance inferable from `¬ IsSquare (discr a b)`
--- if `2 ≠ 0` in the field.
-example {a b : ℚ} [Fact (¬ IsSquare (discr a b))] : Field (QuadraticAlgebra ℚ a b) := inferInstance
-
-end field
-
-end QuadraticAlgebra
+deprecated_module (since := "2026-08-19")
diff --git a/Mathlib/Algebra/QuadraticAlgebra/Discriminant.lean b/Mathlib/Algebra/QuadraticAlgebra/Discriminant.lean
new file mode 100644
index 00000000000000..ead44154b53126
--- /dev/null
+++ b/Mathlib/Algebra/QuadraticAlgebra/Discriminant.lean
@@ -0,0 +1,111 @@
+/-
+Copyright (c) 2026 Xavier Roblot. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Xavier Roblot
+-/
+module
+
+public import Mathlib.Algebra.QuadraticAlgebra.Basic
+
+/-!
+# Discriminant of a quadratic algebra
+
+This file introduces the discriminant of a quadratic algebra `QuadraticAlgebra R a b` (with the
+convention `ω² = a + b·ω`), describes how it transforms under a change of generator, and derives,
+over a field, a criterion for `QuadraticAlgebra K a b` to be a field.
+
+## Main definitions
+
+* `QuadraticAlgebra.discr`: the discriminant `discr a b = b ^ 2 + 4 * a`.
+
+## Main results
+
+* `QuadraticAlgebra.discr_changeGenerator`: the discriminant scales by `u ^ 2` under the change
+  of generator `ω ↦ u • ω + k`.
+* `QuadraticAlgebra.exists_sq_eq_iff_isSquare_discr`: over a ring with `2` invertible,
+  `X ^ 2 - b * X - a` has a root iff `discr a b` is a square.
+* `QuadraticAlgebra.isField_iff_not_isSquare_discr`: over a field with `2 ≠ 0`,
+  `QuadraticAlgebra K a b` is a field iff `discr a b` is not a square.
+-/
+
+@[expose] public section
+
+namespace QuadraticAlgebra
+
+variable {R : Type*}
+
+section discr
+
+/-- The discriminant of the quadratic algebra `QuadraticAlgebra R a b`, that is, the
+discriminant `b ^ 2 + 4 * a` of the polynomial `X ^ 2 - b * X - a`. -/
+def discr [CommSemiring R] (a b : R) : R := b ^ 2 + 4 * a
+
+theorem discr_def [CommSemiring R] (a b : R) : discr a b = b ^ 2 + 4 * a := rfl
+
+/-- Under the change of generator `ω ↦ u • ω + k` (see `QuadraticAlgebra.changeGenerator`), the
+discriminant is multiplied by `u ^ 2`. -/
+theorem discr_changeGenerator [CommRing R] (a b u k : R) :
+    discr (u ^ 2 * a - u * b * k - k ^ 2) (u * b + 2 * k) = u ^ 2 * discr a b := by
+  rw [discr_def, discr_def]; ring
+
+@[deprecated (since := "2026-08-14")] alias discr_map := discr_changeGenerator
+
+/-- The discriminant is the square of the different `ω - star ω`. -/
+theorem algebraMap_discr [CommRing R] (a b : R) :
+    algebraMap R (QuadraticAlgebra R a b) (discr a b) = (ω - star ω) ^ 2 := by
+  rw [discr_def]; ext <;> simp [sq] <;> ring
+
+-- The `a = 1` case of `Mathlib.Algebra.QuadraticDiscriminant`, reproved to avoid its heavy
+-- transitive import of `Mathlib.Order.Filter.AtTopBot.Field`.
+/-- If `2` is invertible, the polynomial `X ^ 2 - b * X - a` has a root if and only if the
+discriminant is a square. -/
+theorem exists_sq_eq_iff_isSquare_discr [CommRing R] [Invertible (2 : R)] {a b : R} :
+    (∃ r : R, r ^ 2 = a + b * r) ↔ IsSquare (discr a b) := by
+  rw [isSquare_iff_exists_sq]
+  have h2 := mul_invOf_self (2 : R)
+  refine ⟨fun ⟨r, hr⟩ ↦ ⟨2 * r - b, by rw [discr_def]; grind⟩, fun ⟨s, hs⟩ ↦ ⟨⅟2 * (b + s), ?_⟩⟩
+  rw [discr_def] at hs
+  grind
+
+end discr
+
+section field
+
+-- This `Fact (∀ r, r ^ 2 ≠ …)` instance is the bridge that lets the `Field` instance on
+-- `QuadraticAlgebra K a b` fire from `¬ IsSquare (discr a b)` alone (the `b = 0` bridge from
+-- `¬ IsSquare a` lives in `Basic.lean`).
+instance {K : Type*} [Field K] {a b : K} [NeZero (2 : K)] [Fact (¬ IsSquare (discr a b))] :
+    Fact (∀ r : K, r ^ 2 ≠ a + b * r) :=
+  letI : Invertible (2 : K) := invertibleOfNonzero two_ne_zero
+  ⟨not_exists.mp <| exists_sq_eq_iff_isSquare_discr.not.mpr Fact.out⟩
+
+variable {K : Type*} [Field K]
+
+/-- If `discr a b` is a square, `QuadraticAlgebra K a b` is not a field. -/
+theorem not_isField_of_isSquare_discr [NeZero (2 : K)] {a b : K}
+    (h : IsSquare (discr a b)) : ¬ IsField (QuadraticAlgebra K a b) := by
+  let : Invertible (2 : K) := invertibleOfNonzero two_ne_zero
+  obtain ⟨r, hr⟩ := exists_sq_eq_iff_isSquare_discr.mpr h
+  intro hfield
+  let := hfield.toField
+  have : (⟨r, -1⟩ : QuadraticAlgebra K a b) ∈ nonZeroDivisors (QuadraticAlgebra K a b) := by
+    simp [mem_nonZeroDivisors_iff_ne_zero, QuadraticAlgebra.ext_iff]
+  rw [← norm_mem_nonZeroDivisors_iff, show norm ⟨r, -1⟩ = 0 by rw [norm_def]; grind] at this
+  exact zero_notMem_nonZeroDivisors this
+
+/-- If `2 ≠ 0` in the field `K`, `QuadraticAlgebra K a b` is a field iff `discr a b` is
+not a square. -/
+theorem isField_iff_not_isSquare_discr [NeZero (2 : K)] {a b : K} :
+    IsField (QuadraticAlgebra K a b) ↔ ¬ IsSquare (discr a b) := by
+  let : Invertible (2 : K) := invertibleOfNonzero two_ne_zero
+  refine ⟨fun hfield h ↦ not_isField_of_isSquare_discr h hfield, fun h ↦ ?_⟩
+  have : Fact (¬ IsSquare (discr a b)) := ⟨h⟩
+  exact Field.toIsField (QuadraticAlgebra K a b)
+
+-- The general bridge makes the `Field` instance inferable from `¬ IsSquare (discr a b)`
+-- if `2 ≠ 0` in the field.
+example {a b : ℚ} [Fact (¬ IsSquare (discr a b))] : Field (QuadraticAlgebra ℚ a b) := inferInstance
+
+end field
+
+end QuadraticAlgebra

From 405e37b9a24eb11e12b2ecd73df8bc4b20ef3b00 Mon Sep 17 00:00:00 2001
From: Xavier Roblot <46200072+xroblot@users.noreply.github.com>
Date: Thu, 20 Aug 2026 13:51:04 +0200
Subject: [PATCH 2/3] split off deprecation

---
 Mathlib.lean                                | 1 -
 Mathlib/Algebra/QuadraticAlgebra/Discr.lean | 5 -----
 2 files changed, 6 deletions(-)
 delete mode 100644 Mathlib/Algebra/QuadraticAlgebra/Discr.lean

diff --git a/Mathlib.lean b/Mathlib.lean
index 81e0a493a9af54..fef0dc0f444b96 100644
--- a/Mathlib.lean
+++ b/Mathlib.lean
@@ -1210,7 +1210,6 @@ public import Mathlib.Algebra.Prime.Defs
 public import Mathlib.Algebra.Prime.Lemmas
 public import Mathlib.Algebra.QuadraticAlgebra.Basic
 public import Mathlib.Algebra.QuadraticAlgebra.Defs
-public import Mathlib.Algebra.QuadraticAlgebra.Discr
 public import Mathlib.Algebra.QuadraticAlgebra.Discriminant
 public import Mathlib.Algebra.QuadraticAlgebra.NormDeterminant
 public import Mathlib.Algebra.QuadraticDiscriminant
diff --git a/Mathlib/Algebra/QuadraticAlgebra/Discr.lean b/Mathlib/Algebra/QuadraticAlgebra/Discr.lean
deleted file mode 100644
index 9f1c393f490117..00000000000000
--- a/Mathlib/Algebra/QuadraticAlgebra/Discr.lean
+++ /dev/null
@@ -1,5 +0,0 @@
-module -- shake: keep-all
-
-public import Mathlib.Algebra.QuadraticAlgebra.Discriminant
-
-deprecated_module (since := "2026-08-19")

From 525af60fd78a6c6686d87100ad01afc823b3fc4a Mon Sep 17 00:00:00 2001
From: Xavier Roblot <46200072+xroblot@users.noreply.github.com>
Date: Thu, 20 Aug 2026 13:51:59 +0200
Subject: [PATCH 3/3] add deprecation shim for Discr

---
 Mathlib.lean                                | 1 +
 Mathlib/Algebra/QuadraticAlgebra/Discr.lean | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 Mathlib/Algebra/QuadraticAlgebra/Discr.lean

diff --git a/Mathlib.lean b/Mathlib.lean
index fef0dc0f444b96..81e0a493a9af54 100644
--- a/Mathlib.lean
+++ b/Mathlib.lean
@@ -1210,6 +1210,7 @@ public import Mathlib.Algebra.Prime.Defs
 public import Mathlib.Algebra.Prime.Lemmas
 public import Mathlib.Algebra.QuadraticAlgebra.Basic
 public import Mathlib.Algebra.QuadraticAlgebra.Defs
+public import Mathlib.Algebra.QuadraticAlgebra.Discr
 public import Mathlib.Algebra.QuadraticAlgebra.Discriminant
 public import Mathlib.Algebra.QuadraticAlgebra.NormDeterminant
 public import Mathlib.Algebra.QuadraticDiscriminant
diff --git a/Mathlib/Algebra/QuadraticAlgebra/Discr.lean b/Mathlib/Algebra/QuadraticAlgebra/Discr.lean
new file mode 100644
index 00000000000000..d27848791c8b7b
--- /dev/null
+++ b/Mathlib/Algebra/QuadraticAlgebra/Discr.lean
@@ -0,0 +1,5 @@
+module -- shake: keep-all
+
+public import Mathlib.Algebra.QuadraticAlgebra.Discriminant
+
+deprecated_module (since := "2026-08-20")