Skip to content

Commit 4792cda

Browse files
authored
chore: bump toolchain to v4.18.0-rc1 (#256)
1 parent 37ba102 commit 4792cda

File tree

8 files changed

+23
-21
lines changed

8 files changed

+23
-21
lines changed

Carleson/Antichain/TileCorrelation.lean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,12 @@ lemma uncertainty (ha : 1 ≤ a) {p₁ p₂ : 𝔓 X} (hle : 𝔰 p₁ ≤ 𝔰
340340
apply add_le_add_right
341341
norm_cast
342342
nth_rewrite 1 [← pow_one 2]
343-
exact Nat.pow_le_pow_of_le_right zero_lt_two (by omega)
343+
exact Nat.pow_le_pow_right zero_lt_two (by omega)
344344
_ = 2 * (2 : ℝ)^ (6 * a) := by ring
345345
_ ≤ 2 ^ (a * 8) := by
346346
nth_rewrite 1 [← pow_one 2, ← pow_add]
347347
norm_cast
348-
exact Nat.pow_le_pow_of_le_right zero_lt_two (by omega)
348+
exact Nat.pow_le_pow_right zero_lt_two (by omega)
349349
have h38 : 38 := by omega
350350
have h12 : (1 : ℝ) ≤ 2 := by linarith
351351
rw [C_6_2_3]

Carleson/ForestOperator/LargeSeparation.lean

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,8 @@ lemma enorm_ψ_le_edist {y : X} (my : y ∈ E p) (hx' : x' ∉ ball (𝔠 p) (5
482482
_ = (edist x x' / D ^ (𝔰 p) * 4) ^ (a : ℝ)⁻¹ := by
483483
rw [enorm_mul]; nth_rw 2 [enorm_eq_nnnorm]; rw [Real.nnnorm_ofNat, ENNReal.coe_ofNat]; congr
484484
rw [enorm_eq_nnnorm, nnnorm_div, nnnorm_zpow]; norm_cast
485-
rw [ENNReal.coe_div (by simp; positivity), ENNReal.coe_zpow (by simp)]; norm_cast; congr
485+
rw [ENNReal.coe_div (by simp only [defaultD, Nat.cast_pow, Nat.cast_ofNat, defaultA,
486+
defaultκ.eq_1, ne_eq]; positivity), ENNReal.coe_zpow (by simp)]; norm_cast; congr
486487
rw [edist_dist, ← Real.enorm_of_nonneg dist_nonneg, enorm_eq_nnnorm]
487488
_ ≤ _ := by
488489
rw [ENNReal.mul_rpow_of_nonneg _ _ (by positivity), mul_comm]; gcongr
@@ -822,7 +823,7 @@ lemma holder_correlation_tile (hu : u ∈ t) (hp : p ∈ t u) (hf : BoundedCompa
822823
exact holder_correlation_tile_two hu hp hf hx hx'
823824

824825
/-- Part of Lemma 7.5.6. -/
825-
lemma limited_scale_impact__first_estimate (hu₁ : u₁ ∈ t) (hu₂ : u₂ ∈ t) (hu : u₁ ≠ u₂)
826+
lemma limited_scale_impact_first_estimate (hu₁ : u₁ ∈ t) (hu₂ : u₂ ∈ t) (hu : u₁ ≠ u₂)
826827
(h2u : 𝓘 u₁ ≤ 𝓘 u₂) (hp : p ∈ t u₂ \ 𝔖₀ t u₁ u₂) (hJ : J ∈ 𝓙₅ t u₁ u₂)
827828
(h : ¬Disjoint (ball (𝔠 p) (8 * D ^ 𝔰 p)) (ball (c J) (8⁻¹ * D ^ s J))) : s J ≤ 𝔰 p := by
828829
by_contra! contr
@@ -874,7 +875,7 @@ lemma limited_scale_impact__first_estimate (hu₁ : u₁ ∈ t) (hu₂ : u₂
874875
norm_cast
875876

876877
/-- Part of Lemma 7.5.6. -/
877-
lemma limited_scale_impact__second_estimate (hp : p ∈ t u₂ \ 𝔖₀ t u₁ u₂) (hJ : J ∈ 𝓙₅ t u₁ u₂)
878+
lemma limited_scale_impact_second_estimate (hp : p ∈ t u₂ \ 𝔖₀ t u₁ u₂) (hJ : J ∈ 𝓙₅ t u₁ u₂)
878879
(h : ¬Disjoint (ball (𝔠 p) (8 * D ^ 𝔰 p)) (ball (c J) (8⁻¹ * D ^ s J))) :
879880
𝔰 p ≤ s J + 3 := by
880881
by_contra! three
@@ -938,8 +939,8 @@ lemma limited_scale_impact (hu₁ : u₁ ∈ t) (hu₂ : u₂ ∈ t) (hu : u₁
938939
(h2u : 𝓘 u₁ ≤ 𝓘 u₂) (hp : p ∈ t u₂ \ 𝔖₀ t u₁ u₂) (hJ : J ∈ 𝓙₅ t u₁ u₂)
939940
(h : ¬ Disjoint (ball (𝔠 p) (8 * D ^ 𝔰 p)) (ball (c J) (8⁻¹ * D ^ s J))) :
940941
𝔰 p ∈ Icc (s J) (s J + 3) :=
941-
limited_scale_impact__first_estimate hu₁ hu₂ hu h2u hp hJ h,
942-
limited_scale_impact__second_estimate hp hJ h⟩
942+
limited_scale_impact_first_estimate hu₁ hu₂ hu h2u hp hJ h,
943+
limited_scale_impact_second_estimate hp hJ h⟩
943944

944945
lemma local_tree_control_sumsumsup (hu₁ : u₁ ∈ t) (hu₂ : u₂ ∈ t) (hu : u₁ ≠ u₂)
945946
(h2u : 𝓘 u₁ ≤ 𝓘 u₂) (hJ : J ∈ 𝓙₅ t u₁ u₂) (hf : BoundedCompactSupport f) :

Carleson/ForestOperator/PointwiseEstimate.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ private lemma L7_1_4_integrand_bound (hu : u ∈ t) {s : ℤ} (hs : s ∈ t.σ u
389389
gcongr
390390
norm_cast
391391
rw_mod_cast [← pow_add]
392-
refine Nat.pow_le_pow_of_le_right two_pos <| Nat.add_le_of_le_sub ?_ ?_
392+
refine Nat.pow_le_pow_right two_pos <| Nat.add_le_of_le_sub ?_ ?_
393393
· exact Nat.mul_le_mul_right _ (by norm_num)
394394
· rw [← Nat.sub_mul, (show a ^ 3 = a ^ 2 * a from rfl)]; nlinarith [four_le_a X]
395395

Carleson/ToMathlib/BoundedCompactSupport.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ omit [TopologicalSpace X] in
7373
-- maybe in mathlib, but couldn't find it
7474
theorem ae_le_of_eLpNorm_top_lt_top (hf : eLpNorm f ⊤ μ < ⊤) :
7575
∀ᵐ x ∂μ, ‖f x‖ ≤ ENNReal.toReal (eLpNorm f ⊤ μ) := by
76-
have := coe_nnnorm_ae_le_eLpNormEssSup f μ
76+
have := enorm_ae_le_eLpNormEssSup f μ
7777
filter_upwards [this] with x hx
7878
have : ENNReal.ofReal ‖f x‖₊ ≠ ⊤ := ENNReal.ofReal_ne_top
7979
convert (ENNReal.toReal_le_toReal this ?_).mpr ?_

Carleson/ToMathlib/Data/ENNReal.lean

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Mathlib.Analysis.Normed.Field.Basic
2-
import Mathlib.Topology.Instances.NNReal.Defs
2+
import Mathlib.Order.CompletePartialOrder
3+
import Mathlib.Topology.Order.Real
34

45
/-! ## `ENNReal` manipulation lemmas -/
56

Carleson/ToMathlib/HardyLittlewood.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ theorem MB_le_eLpNormEssSup {u : X → E} {x : X} : MB μ 𝓑 c r u x ≤ eLpNo
270270
fun _x ↦ ⨍⁻ _y in ball (c i) (r i), eLpNormEssSup u μ ∂μ := by
271271
simp_rw [MB, maximalFunction, inv_one, ENNReal.rpow_one]
272272
gcongr
273-
exact coe_nnnorm_ae_le_eLpNormEssSup u μ
273+
exact MeasureTheory.enorm_ae_le_eLpNormEssSup u μ
274274
_ ≤ ⨆ i ∈ 𝓑, (ball (c i) (r i)).indicator (x := x) fun _x ↦ eLpNormEssSup u μ := by
275275
gcongr; apply setLaverage_const_le
276276
_ ≤ ⨆ i ∈ 𝓑, eLpNormEssSup u μ := by gcongr; apply indicator_le_self

lake-manifest.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"type": "git",
1616
"subDir": null,
1717
"scope": "",
18-
"rev": "5269898d6a51d047931107c8d72d934d8d5d3753",
18+
"rev": "b523ce86050b5a10fc246cfa4d330aaa0f6df896",
1919
"name": "mathlib",
2020
"manifestFile": "lake-manifest.json",
2121
"inputRev": null,
@@ -25,7 +25,7 @@
2525
"type": "git",
2626
"subDir": null,
2727
"scope": "leanprover-community",
28-
"rev": "c708be04267e3e995a14ac0d08b1530579c1525a",
28+
"rev": "ebfb31672ab0a5b6d00a018ff67d2ec51ed66f3a",
2929
"name": "plausible",
3030
"manifestFile": "lake-manifest.json",
3131
"inputRev": "main",
@@ -45,7 +45,7 @@
4545
"type": "git",
4646
"subDir": null,
4747
"scope": "leanprover-community",
48-
"rev": "0447b0a7b7f41f0a1749010db3f222e4a96f9d30",
48+
"rev": "08372f1ec11df288ff76621ead7b0b575cb29355",
4949
"name": "importGraph",
5050
"manifestFile": "lake-manifest.json",
5151
"inputRev": "main",
@@ -55,17 +55,17 @@
5555
"type": "git",
5656
"subDir": null,
5757
"scope": "leanprover-community",
58-
"rev": "799f6986de9f61b784ff7be8f6a8b101045b8ffd",
58+
"rev": "a602d13aca2913724c7d47b2d7df0353620c4ee8",
5959
"name": "proofwidgets",
6060
"manifestFile": "lake-manifest.json",
61-
"inputRev": "v0.0.52",
61+
"inputRev": "v0.0.53",
6262
"inherited": true,
6363
"configFile": "lakefile.lean"},
6464
{"url": "https://github.com/leanprover-community/aesop",
6565
"type": "git",
6666
"subDir": null,
6767
"scope": "leanprover-community",
68-
"rev": "56a2c80b209c253e0281ac4562a92122b457dcc0",
68+
"rev": "ec060e0e10c685be8af65f288e23d026c9fde245",
6969
"name": "aesop",
7070
"manifestFile": "lake-manifest.json",
7171
"inputRev": "master",
@@ -75,7 +75,7 @@
7575
"type": "git",
7676
"subDir": null,
7777
"scope": "leanprover-community",
78-
"rev": "95561f7a5811fae6a309e4a1bbe22a0a4a98bf03",
78+
"rev": "d892d7a88ad0ccf748fb8e651308ccd13426ba73",
7979
"name": "Qq",
8080
"manifestFile": "lake-manifest.json",
8181
"inputRev": "master",
@@ -85,7 +85,7 @@
8585
"type": "git",
8686
"subDir": null,
8787
"scope": "leanprover-community",
88-
"rev": "efcc7d9bd9936ecdc625baf0d033b60866565cd5",
88+
"rev": "cce013731b5b355ff4528ac9717ae3e0cc5c4519",
8989
"name": "batteries",
9090
"manifestFile": "lake-manifest.json",
9191
"inputRev": "main",
@@ -95,7 +95,7 @@
9595
"type": "git",
9696
"subDir": null,
9797
"scope": "leanprover",
98-
"rev": "e7fd1a415c80985ade02a021172834ca2139b0ca",
98+
"rev": "dd423cf2b153b5b14cb017ee4beae788565a3925",
9999
"name": "Cli",
100100
"manifestFile": "lake-manifest.json",
101101
"inputRev": "main",

lean-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
leanprover/lean4:v4.17.0
1+
leanprover/lean4:v4.18.0-rc1

0 commit comments

Comments
 (0)