Changes since the initial port

The following section lists changes to this file in mathlib3 and mathlib4 that occured after the initial port. Most recent changes are shown first. Hovering over a commit will show all commits associated with the same mathlib3 commit.

Changes in mathlib3

2d6f88c2

(last sync)

Changes in mathlib3port

mathlib3

mathlib3port

08b081ea

bump to nightly-2024-04-06-08

mathlib commit https://github.com/leanprover-community/mathlib/commit/65a1391a0106c9204fe45bc73a039f056558cb83

e34029c9

Diff

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Kevin Buzzard
 -/
 import Tactic.IntervalCases
-import Data.Nat.Modeq
+import Data.Nat.ModEq
 
 #align_import imo.imo1964_q1 from "leanprover-community/mathlib"@"08b081ea92d80e3a41f899eea36ef6d56e0f1db0"

08b081ea

bump to nightly-2024-03-17-08

mathlib commit https://github.com/leanprover-community/mathlib/commit/65a1391a0106c9204fe45bc73a039f056558cb83

22f01ce4

Diff

@@ -74,18 +74,18 @@ theorem imo1964_q1a (n : ℕ) (hn : 0 < n) : ProblemPredicate n ↔ 3 ∣ n :=
   constructor
   · intro h
     let t := n % 3
-    rw [show n = 3 * (n / 3) + t from (Nat.div_add_mod n 3).symm] at h 
+    rw [show n = 3 * (n / 3) + t from (Nat.div_add_mod n 3).symm] at h
     have ht : t < 3 := Nat.mod_lt _ (by decide)
-    interval_cases hr : t <;> rw [hr] at h 
+    interval_cases hr : t <;> rw [hr] at h
     · exact Nat.dvd_of_mod_eq_zero hr
     · exfalso
       have nonsense := (two_pow_three_mul_add_one_mod_seven _).symm.trans h
-      rw [modeq_iff_dvd] at nonsense 
-      norm_num at nonsense 
+      rw [modeq_iff_dvd] at nonsense
+      norm_num at nonsense
     · exfalso
       have nonsense := (two_pow_three_mul_add_two_mod_seven _).symm.trans h
-      rw [modeq_iff_dvd] at nonsense 
-      norm_num at nonsense 
+      rw [modeq_iff_dvd] at nonsense
+      norm_num at nonsense
   · rintro ⟨m, rfl⟩
     apply two_pow_three_mul_mod_seven
 #align imo1964_q1.imo1964_q1a Imo1964Q1.imo1964_q1a
@@ -103,15 +103,15 @@ theorem imo1964_q1b (n : ℕ) : ¬7 ∣ 2 ^ n + 1 :=
   · rw [add_zero]
     intro h
     have := h.symm.trans ((two_pow_three_mul_mod_seven _).addRight _)
-    rw [modeq_iff_dvd] at this 
-    norm_num at this 
+    rw [modeq_iff_dvd] at this
+    norm_num at this
   · intro h
     have := h.symm.trans ((two_pow_three_mul_add_one_mod_seven _).addRight _)
-    rw [modeq_iff_dvd] at this 
-    norm_num at this 
+    rw [modeq_iff_dvd] at this
+    norm_num at this
   · intro h
     have := h.symm.trans ((two_pow_three_mul_add_two_mod_seven _).addRight _)
-    rw [modeq_iff_dvd] at this 
-    norm_num at this 
+    rw [modeq_iff_dvd] at this
+    norm_num at this
 #align imo1964_q1b imo1964_q1b

08b081ea

bump to nightly-2023-09-24-06

mathlib commit https://github.com/leanprover-community/mathlib/commit/ce64cd319bb6b3e82f31c2d38e79080d377be451

5655435f

Diff

@@ -3,8 +3,8 @@ Copyright (c) 2020 Kevin Buzzard. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Kevin Buzzard
 -/
-import Mathbin.Tactic.IntervalCases
-import Mathbin.Data.Nat.Modeq
+import Tactic.IntervalCases
+import Data.Nat.Modeq
 
 #align_import imo.imo1964_q1 from "leanprover-community/mathlib"@"08b081ea92d80e3a41f899eea36ef6d56e0f1db0"

08b081ea

bump to nightly-2023-08-17-09

mathlib commit https://github.com/leanprover-community/mathlib/commit/32a7e535287f9c73f2e4d2aef306a39190f0b504

60285dcc

Diff

@@ -32,25 +32,25 @@ open Nat
 
 namespace Imo1964Q1
 
-theorem two_pow_three_mul_mod_seven (m : ℕ) : 2 ^ (3 * m) ≡ 1 [MOD 7] :=
+theorem two_pow_three_hMul_mod_seven (m : ℕ) : 2 ^ (3 * m) ≡ 1 [MOD 7] :=
   by
   rw [pow_mul]
   have h : 8 ≡ 1 [MOD 7] := modeq_of_dvd (by use-1; norm_num)
   convert h.pow _
   simp
-#align imo1964_q1.two_pow_three_mul_mod_seven Imo1964Q1.two_pow_three_mul_mod_seven
+#align imo1964_q1.two_pow_three_mul_mod_seven Imo1964Q1.two_pow_three_hMul_mod_seven
 
-theorem two_pow_three_mul_add_one_mod_seven (m : ℕ) : 2 ^ (3 * m + 1) ≡ 2 [MOD 7] :=
+theorem two_pow_three_hMul_add_one_mod_seven (m : ℕ) : 2 ^ (3 * m + 1) ≡ 2 [MOD 7] :=
   by
   rw [pow_add]
   exact (two_pow_three_mul_mod_seven m).mulRight _
-#align imo1964_q1.two_pow_three_mul_add_one_mod_seven Imo1964Q1.two_pow_three_mul_add_one_mod_seven
+#align imo1964_q1.two_pow_three_mul_add_one_mod_seven Imo1964Q1.two_pow_three_hMul_add_one_mod_seven
 
-theorem two_pow_three_mul_add_two_mod_seven (m : ℕ) : 2 ^ (3 * m + 2) ≡ 4 [MOD 7] :=
+theorem two_pow_three_hMul_add_two_mod_seven (m : ℕ) : 2 ^ (3 * m + 2) ≡ 4 [MOD 7] :=
   by
   rw [pow_add]
   exact (two_pow_three_mul_mod_seven m).mulRight _
-#align imo1964_q1.two_pow_three_mul_add_two_mod_seven Imo1964Q1.two_pow_three_mul_add_two_mod_seven
+#align imo1964_q1.two_pow_three_mul_add_two_mod_seven Imo1964Q1.two_pow_three_hMul_add_two_mod_seven
 
 /-!
 ## The question

08b081ea

bump to nightly-2023-08-02-01

mathlib commit https://github.com/leanprover-community/mathlib/commit/63721b2c3eba6c325ecf8ae8cca27155a4f6306f

7aca3f15

Diff

@@ -35,7 +35,7 @@ namespace Imo1964Q1
 theorem two_pow_three_mul_mod_seven (m : ℕ) : 2 ^ (3 * m) ≡ 1 [MOD 7] :=
   by
   rw [pow_mul]
-  have h : 8 ≡ 1 [MOD 7] := modeq_of_dvd (by use -1; norm_num)
+  have h : 8 ≡ 1 [MOD 7] := modeq_of_dvd (by use-1; norm_num)
   convert h.pow _
   simp
 #align imo1964_q1.two_pow_three_mul_mod_seven Imo1964Q1.two_pow_three_mul_mod_seven

08b081ea

bump to nightly-2023-07-20-09

mathlib commit https://github.com/leanprover-community/mathlib/commit/8ea5598db6caeddde6cb734aa179cc2408dbd345

9c56d0dd

Diff

@@ -2,15 +2,12 @@
 Copyright (c) 2020 Kevin Buzzard. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Kevin Buzzard
-
-! This file was ported from Lean 3 source module imo.imo1964_q1
-! leanprover-community/mathlib commit 08b081ea92d80e3a41f899eea36ef6d56e0f1db0
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathbin.Tactic.IntervalCases
 import Mathbin.Data.Nat.Modeq
 
+#align_import imo.imo1964_q1 from "leanprover-community/mathlib"@"08b081ea92d80e3a41f899eea36ef6d56e0f1db0"
+
 /-!
 # IMO 1964 Q1

08b081ea

bump to nightly-2023-07-17-03

mathlib commit https://github.com/leanprover-community/mathlib/commit/bf2428c9486c407ca38b5b3fb10b87dad0bc99fa

a159b65f

Diff

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Kevin Buzzard
 
 ! This file was ported from Lean 3 source module imo.imo1964_q1
-! leanprover-community/mathlib commit 2d6f88c296da8df484d7f5b9ee1d10910ab473a2
+! leanprover-community/mathlib commit 08b081ea92d80e3a41f899eea36ef6d56e0f1db0
 ! Please do not edit these lines, except to modify the commit id
 ! if you have ported upstream changes.
 -/
@@ -14,6 +14,9 @@ import Mathbin.Data.Nat.Modeq
 /-!
 # IMO 1964 Q1
 
+> THIS FILE IS SYNCHRONIZED WITH MATHLIB4.
+> Any changes to this file require a corresponding PR to mathlib4.
+
 (a) Find all positive integers $n$ for which $2^n-1$ is divisible by $7$.
 
 (b) Prove that there is no positive integer $n$ for which $2^n+1$ is divisible by $7$.

2d6f88c2

bump to nightly-2023-06-07-01

mathlib commit https://github.com/leanprover-community/mathlib/commit/a3209ddf94136d36e5e5c624b10b2a347cc9d090

176da745

Changes in mathlib4

mathlib3

mathlib4

2d6f88c2

chore: remove stream-of-consciousness uses of have, replace and suffices (#10640)

No changes to tactic file, it's just boring fixes throughout the library.

This follows on from #6964.

Co-authored-by: sgouezel <sebastien.gouezel@univ-rennes1.fr> Co-authored-by: Eric Wieser <wieser.eric@gmail.com>

a13e8040

Diff

@@ -65,8 +65,8 @@ theorem imo1964_q1b (n : ℕ) : ¬7 ∣ 2 ^ n + 1 := by
   intro h
   let t := n % 3
   have : t < 3 := Nat.mod_lt _ (by decide)
-  have H : 2 ^ t + 1 ≡ 0 [MOD 7]
-  · calc 2 ^ t + 1 ≡ 2 ^ n + 1 [MOD 7 ] := by gcongr ?_ + 1; exact (two_pow_mod_seven n).symm
+  have H : 2 ^ t + 1 ≡ 0 [MOD 7] := calc
+    2 ^ t + 1 ≡ 2 ^ n + 1 [MOD 7 ] := by gcongr ?_ + 1; exact (two_pow_mod_seven n).symm
       _ ≡ 0 [MOD 7] := h.modEq_zero_nat
   interval_cases t <;> contradiction
 #align imo1964_q1b imo1964_q1b

2d6f88c2

chore: bump to v4.3.0-rc2 (#8366)

PR contents

This is the supremum of

#8284
#8056
#8023
#8332
#8226 (already approved)
#7834 (already approved)

along with some minor fixes from failures on nightly-testing as Mathlib master is merged into it.

Note that some PRs for changes that are already compatible with the current toolchain and will be necessary have already been split out: #8380.

I am hopeful that in future we will be able to progressively merge adaptation PRs into a bump/v4.X.0 branch, so we never end up with a "big merge" like this. However one of these adaptation PRs (#8056) predates my new scheme for combined CI, and it wasn't possible to keep that PR viable in the meantime.

Lean PRs involved in this bump

In particular this includes adjustments for the Lean PRs

leanprover/lean4#2778

We can get rid of all the

local macro_rules | `($x ^ $y) => `(HPow.hPow $x $y) -- Porting note: See issue [lean4#2220](https://github.com/leanprover/lean4/pull/2220)

macros across Mathlib (and in any projects that want to write natural number powers of reals).

leanprover/lean4#2722

Changes the default behaviour of simp to (config := {decide := false}). This makes simp (and consequentially norm_num) less powerful, but also more consistent, and less likely to blow up in long failures. This requires a variety of changes: changing some previously by simp or norm_num to decide or rfl, or adding (config := {decide := true}).

leanprover/lean4#2783

This changed the behaviour of simp so that simp [f] will only unfold "fully applied" occurrences of f. The old behaviour can be recovered with simp (config := { unfoldPartialApp := true }). We may in future add a syntax for this, e.g. simp [!f]; please provide feedback! In the meantime, we have made the following changes:

switching to using explicit lemmas that have the intended level of application
(config := { unfoldPartialApp := true }) in some places, to recover the old behaviour
Using @[eqns] to manually adjust the equation lemmas for a particular definition, recovering the old behaviour just for that definition. See #8371, where we do this for Function.comp and Function.flip.

This change in Lean may require further changes down the line (e.g. adding the !f syntax, and/or upstreaming the special treatment for Function.comp and Function.flip, and/or removing this special treatment). Please keep an open and skeptical mind about these changes!

Co-authored-by: leanprover-community-mathlib4-bot <leanprover-community-mathlib4-bot@users.noreply.github.com> Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Eric Wieser <wieser.eric@gmail.com> Co-authored-by: Mauricio Collares <mauricio@collares.org>

40b64f79

Diff

@@ -34,7 +34,7 @@ theorem two_pow_mod_seven (n : ℕ) : 2 ^ n ≡ 2 ^ (n % 3) [MOD 7] :=
   let t := n % 3
   calc 2 ^ n = 2 ^ (3 * (n / 3) + t) := by rw [Nat.div_add_mod]
     _ = (2 ^ 3) ^ (n / 3) * 2 ^ t := by rw [pow_add, pow_mul]
-    _ ≡ 1 ^ (n / 3) * 2 ^ t [MOD 7] := by gcongr; norm_num
+    _ ≡ 1 ^ (n / 3) * 2 ^ t [MOD 7] := by gcongr; decide
     _ = 2 ^ t := by ring
 
 /-!
@@ -68,5 +68,5 @@ theorem imo1964_q1b (n : ℕ) : ¬7 ∣ 2 ^ n + 1 := by
   have H : 2 ^ t + 1 ≡ 0 [MOD 7]
   · calc 2 ^ t + 1 ≡ 2 ^ n + 1 [MOD 7 ] := by gcongr ?_ + 1; exact (two_pow_mod_seven n).symm
       _ ≡ 0 [MOD 7] := h.modEq_zero_nat
-  interval_cases t <;> norm_num at H
+  interval_cases t <;> contradiction
 #align imo1964_q1b imo1964_q1b

2d6f88c2

chore: script to replace headers with #align_import statements (#5979)

depends on: #5966

Co-authored-by: Eric Wieser <wieser.eric@gmail.com> Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

89aa3a3b

Diff

@@ -2,16 +2,13 @@
 Copyright (c) 2020 Kevin Buzzard. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Kevin Buzzard
-
-! This file was ported from Lean 3 source module imo.imo1964_q1
-! leanprover-community/mathlib commit 2d6f88c296da8df484d7f5b9ee1d10910ab473a2
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.Tactic.IntervalCases
 import Mathlib.Data.Nat.ModEq
 import Mathlib.Tactic.Ring
 
+#align_import imo.imo1964_q1 from "leanprover-community/mathlib"@"2d6f88c296da8df484d7f5b9ee1d10910ab473a2"
+
 /-!
 # IMO 1964 Q1

2d6f88c2

fix: piObj / sigmaObj precedence (#5618)

074b9ebe

Diff

@@ -49,7 +49,7 @@ def ProblemPredicate (n : ℕ) : Prop :=
   7 ∣ 2 ^ n - 1
 #align imo1964_q1.problem_predicate Imo1964Q1.ProblemPredicate
 
-theorem imo1964_q1a (n : ℕ) (hn : 0 < n) : ProblemPredicate n ↔ 3 ∣ n := by
+theorem imo1964_q1a (n : ℕ) (_ : 0 < n) : ProblemPredicate n ↔ 3 ∣ n := by
   let t := n % 3
   have : t < 3 := Nat.mod_lt _ (by decide)
   calc 7 ∣ 2 ^ n - 1 ↔ 2 ^ n ≡ 1 [MOD 7] := by

2d6f88c2

feat: golf IMO 1964 q1 (#5314)

gcongr lets modular arithmetic calculations go faster. I've been pretty cavalier about deleting auxiliary lemmas from the old solution which weren't needed in the new; this is ok per Scott.

33503c18

Diff

@@ -10,6 +10,7 @@ Authors: Kevin Buzzard
 -/
 import Mathlib.Tactic.IntervalCases
 import Mathlib.Data.Nat.ModEq
+import Mathlib.Tactic.Ring
 
 /-!
 # IMO 1964 Q1
@@ -32,22 +33,12 @@ open Nat
 
 namespace Imo1964Q1
 
-theorem two_pow_three_mul_mod_seven (m : ℕ) : 2 ^ (3 * m) ≡ 1 [MOD 7] := by
-  rw [pow_mul]
-  have h : 8 ≡ 1 [MOD 7] := modEq_of_dvd (by use -1; norm_num)
-  convert h.pow _
-  simp
-#align imo1964_q1.two_pow_three_mul_mod_seven Imo1964Q1.two_pow_three_mul_mod_seven
-
-theorem two_pow_three_mul_add_one_mod_seven (m : ℕ) : 2 ^ (3 * m + 1) ≡ 2 [MOD 7] := by
-  rw [pow_add]
-  exact (two_pow_three_mul_mod_seven m).mul_right _
-#align imo1964_q1.two_pow_three_mul_add_one_mod_seven Imo1964Q1.two_pow_three_mul_add_one_mod_seven
-
-theorem two_pow_three_mul_add_two_mod_seven (m : ℕ) : 2 ^ (3 * m + 2) ≡ 4 [MOD 7] := by
-  rw [pow_add]
-  exact (two_pow_three_mul_mod_seven m).mul_right _
-#align imo1964_q1.two_pow_three_mul_add_two_mod_seven Imo1964Q1.two_pow_three_mul_add_two_mod_seven
+theorem two_pow_mod_seven (n : ℕ) : 2 ^ n ≡ 2 ^ (n % 3) [MOD 7] :=
+  let t := n % 3
+  calc 2 ^ n = 2 ^ (3 * (n / 3) + t) := by rw [Nat.div_add_mod]
+    _ = (2 ^ 3) ^ (n / 3) * 2 ^ t := by rw [pow_add, pow_mul]
+    _ ≡ 1 ^ (n / 3) * 2 ^ t [MOD 7] := by gcongr; norm_num
+    _ = 2 ^ t := by ring
 
 /-!
 ## The question
@@ -58,31 +49,15 @@ def ProblemPredicate (n : ℕ) : Prop :=
   7 ∣ 2 ^ n - 1
 #align imo1964_q1.problem_predicate Imo1964Q1.ProblemPredicate
 
-theorem aux (n : ℕ) : ProblemPredicate n ↔ 2 ^ n ≡ 1 [MOD 7] := by
-  rw [Nat.ModEq.comm]
-  apply (modEq_iff_dvd' _).symm
-  apply Nat.one_le_pow'
-#align imo1964_q1.aux Imo1964Q1.aux
-
 theorem imo1964_q1a (n : ℕ) (hn : 0 < n) : ProblemPredicate n ↔ 3 ∣ n := by
-  rw [aux]
-  constructor
-  · intro h
-    let t := n % 3
-    rw [show n = 3 * (n / 3) + t from (Nat.div_add_mod n 3).symm] at h
-    have ht : t < 3 := Nat.mod_lt _ (by decide)
-    interval_cases hr : t <;> simp only [hr] at h
-    · exact Nat.dvd_of_mod_eq_zero hr
-    · exfalso
-      have nonsense := (two_pow_three_mul_add_one_mod_seven _).symm.trans h
-      rw [modEq_iff_dvd] at nonsense
-      norm_num at nonsense
-    · exfalso
-      have nonsense := (two_pow_three_mul_add_two_mod_seven _).symm.trans h
-      rw [modEq_iff_dvd] at nonsense
-      norm_num at nonsense
-  · rintro ⟨m, rfl⟩
-    apply two_pow_three_mul_mod_seven
+  let t := n % 3
+  have : t < 3 := Nat.mod_lt _ (by decide)
+  calc 7 ∣ 2 ^ n - 1 ↔ 2 ^ n ≡ 1 [MOD 7] := by
+        rw [Nat.ModEq.comm, Nat.modEq_iff_dvd']
+        apply Nat.one_le_pow'
+    _ ↔ 2 ^ t ≡ 1 [MOD 7] := ⟨(two_pow_mod_seven n).symm.trans, (two_pow_mod_seven n).trans⟩
+    _ ↔ t = 0 := by interval_cases t <;> decide
+    _ ↔ 3 ∣ n := by rw [dvd_iff_mod_eq_zero]
 #align imo1964_q1.imo1964_q1a Imo1964Q1.imo1964_q1a
 
 end Imo1964Q1
@@ -90,21 +65,11 @@ end Imo1964Q1
 open Imo1964Q1
 
 theorem imo1964_q1b (n : ℕ) : ¬7 ∣ 2 ^ n + 1 := by
+  intro h
   let t := n % 3
-  rw [← modEq_zero_iff_dvd, show n = 3 * (n / 3) + t from (Nat.div_add_mod n 3).symm]
-  have ht : t < 3 := Nat.mod_lt _ (by decide)
-  interval_cases hr : t <;> simp only [hr]
-  · rw [add_zero]
-    intro h
-    have := h.symm.trans ((two_pow_three_mul_mod_seven _).add_right _)
-    rw [modEq_iff_dvd] at this
-    norm_num at this
-  · intro h
-    have := h.symm.trans ((two_pow_three_mul_add_one_mod_seven _).add_right _)
-    rw [modEq_iff_dvd] at this
-    norm_num at this
-  · intro h
-    have := h.symm.trans ((two_pow_three_mul_add_two_mod_seven _).add_right _)
-    rw [modEq_iff_dvd] at this
-    norm_num at this
+  have : t < 3 := Nat.mod_lt _ (by decide)
+  have H : 2 ^ t + 1 ≡ 0 [MOD 7]
+  · calc 2 ^ t + 1 ≡ 2 ^ n + 1 [MOD 7 ] := by gcongr ?_ + 1; exact (two_pow_mod_seven n).symm
+      _ ≡ 0 [MOD 7] := h.modEq_zero_nat
+  interval_cases t <;> norm_num at H
 #align imo1964_q1b imo1964_q1b

2d6f88c2

chore: add links to porting notes (#5111)

Co-authored-by: Scott Morrison <scott.morrison@anu.edu.au>

cf7c085d

`imo.imo1964_q1` ⟷ `Archive.Imo.Imo1964Q1`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

PR contents

Lean PRs involved in this bump

leanprover/lean4#2778

leanprover/lean4#2722

leanprover/lean4#2783

Dependencies 2

imo.imo1964_q1 ⟷ Archive.Imo.Imo1964Q1

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

PR contents

Lean PRs involved in this bump

leanprover/lean4#2778

leanprover/lean4#2722

leanprover/lean4#2783

Dependencies 2

`imo.imo1964_q1` ⟷ `Archive.Imo.Imo1964Q1`