diff --git a/SphereEversion/Global/OneJetBundle.lean b/SphereEversion/Global/OneJetBundle.lean index 8f1053dd..a3ff1705 100644 --- a/SphereEversion/Global/OneJetBundle.lean +++ b/SphereEversion/Global/OneJetBundle.lean @@ -156,6 +156,7 @@ instance (x : M ร— M') : Module ๐•œ (FJยนMM' x) := end set_option backward.isDefEq.respectTransparency false in +set_option backward.isDefEq.respectTransparency.instanceSearchTypes false in instance : TopologicalSpace JยนMM' := by delta OneJetSpace OneJetBundle infer_instance @@ -177,6 +178,7 @@ instance : ContMDiffVectorBundle โˆž (E โ†’L[๐•œ] E') infer_instance set_option backward.isDefEq.respectTransparency false in +set_option backward.isDefEq.respectTransparency.instanceSearchTypes false in instance : ChartedSpace HJ JยนMM' := by delta OneJetSpace OneJetBundle infer_instance @@ -641,11 +643,10 @@ theorem oneJetBundle_model_space_coe_chartAt (p : OneJetBundle I H I' H') : theorem oneJetBundle_model_space_coe_chartAt_symm (p : OneJetBundle I H I' H') : ((chartAt ๐“œ p).symm : ๐“œ โ†’ OneJetBundle I H I' H') = (Bundle.TotalSpace.toProd (H ร— H') (E โ†’L[๐•œ] E')).symm := by - ext x + ext x <;> rw [โ† OpenPartialHomeomorph.coe_toPartialEquiv_symm, oneJetBundle_model_space_chartAt] + ยท rfl ยท rfl ยท rfl - ยท rw [โ† OpenPartialHomeomorph.coe_toPartialEquiv_symm, oneJetBundle_model_space_chartAt] - rfl variable (I I') diff --git a/SphereEversion/ToMathlib/Analysis/Convex/Basic.lean b/SphereEversion/ToMathlib/Analysis/Convex/Basic.lean index 1120e1b5..169de34d 100644 --- a/SphereEversion/ToMathlib/Analysis/Convex/Basic.lean +++ b/SphereEversion/ToMathlib/Analysis/Convex/Basic.lean @@ -128,7 +128,8 @@ theorem ReallyConvex.add_mem [IsOrderedRing ๐•œ] (hs : ReallyConvex ๐•œ s) {w wโ‚ โ€ข zโ‚ + wโ‚‚ โ€ข zโ‚‚ โˆˆ s := by cases subsingleton_or_nontrivial ๐•œ ยท have := Module.subsingleton ๐•œ E - rwa [Subsingleton.mem_iff_nonempty] at hzโ‚ โŠข + rw [Subsingleton.mem_iff_nonempty] at hzโ‚ โŠข + assumption suffices โˆ‘ b : Bool, cond b wโ‚ wโ‚‚ โ€ข cond b zโ‚ zโ‚‚ โˆˆ s by simpa using this apply hs.sum_mem <;> simp [*] diff --git a/lake-manifest.json b/lake-manifest.json index cb0d5129..ffa681f5 100644 --- a/lake-manifest.json +++ b/lake-manifest.json @@ -1,4 +1,4 @@ -{"version": "1.2.0", +{"version": "1.3.0", "packagesDir": ".lake/packages", "packages": [{"url": "https://github.com/PatrickMassot/checkdecls.git", @@ -15,17 +15,17 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "5ed2965256430c3649e86755f9576b54eca72435", + "rev": "5e0c4e5239cb0a2d86d68a884bf52cfd963fce22", "name": "mathlib", "manifestFile": "lake-manifest.json", - "inputRev": "v4.34.0", + "inputRev": "master", "inherited": false, "configFile": "lakefile.lean"}, {"url": "https://github.com/leanprover-community/plausible", "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "118aa17ee84656b8bd727fef7c458ee8c833385c", + "rev": "fb13df72ecefd8ddbf9291021d7f33a8673eb57b", "name": "plausible", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -35,7 +35,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "ddf04cf3949fa556442341e87d47f9f6e6074707", + "rev": "29ff470276c725ae01505d55b17148c18fc7dfd3", "name": "LeanSearchClient", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -45,7 +45,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "e928b72544873815af278d38681b31c0293588e3", + "rev": "7e81a29bda33a6b257bd37557a6aa6aebe175d96", "name": "importGraph", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -55,7 +55,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "106ff4fafc74ef4ac99d81dbf3ab399118f497a5", + "rev": "c643bbb3c24f8a25f9c14e3a6b1ceb13d01f3de1", "name": "proofwidgets", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -65,7 +65,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "355695d523e41d0554926416cba2a2b3544fbbc9", + "rev": "a90fbf7b02ff06a0deebf74088dff9e5fe02c9ea", "name": "aesop", "manifestFile": "lake-manifest.json", "inputRev": "master", @@ -75,7 +75,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "6a489d9af5d0c47e5b259e2e8bcdfc1811b5a259", + "rev": "37b0ba0b26109cf9f9c541f0f9557e50cfa1a3b9", "name": "Qq", "manifestFile": "lake-manifest.json", "inputRev": "master", @@ -85,7 +85,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "f2effa3d803fda822b1f97b806c47cf2adfbcbc2", + "rev": "33131f4fb10067cb3009bf4db615d9680c1ccd6b", "name": "batteries", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -95,10 +95,10 @@ "type": "git", "subDir": null, "scope": "leanprover", - "rev": "e92c9f15fdfacc8536f31cfb3b7ad26c3c8cd204", + "rev": "843844fa601dd56767b1eb22b7ada5b64d5e567a", "name": "Cli", "manifestFile": "lake-manifest.json", - "inputRev": "v4.34.0", + "inputRev": "v4.35.0-rc3", "inherited": true, "configFile": "lakefile.toml"}], "name": "SphereEversion", diff --git a/lakefile.toml b/lakefile.toml index 0247e049..f2a95077 100644 --- a/lakefile.toml +++ b/lakefile.toml @@ -11,7 +11,6 @@ weak.linter.style.header = false [[require]] name = "mathlib" scope = "leanprover-community" -rev = "v4.34.0" [[require]] name = "checkdecls" diff --git a/lean-toolchain b/lean-toolchain index 12359f92..9d74fe15 100644 --- a/lean-toolchain +++ b/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:v4.34.0 +leanprover/lean4:v4.35.0-rc3 \ No newline at end of file