data.set.functor | Mathlib porting status

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

207cfac9

(last sync)

Changes in mathlib3port

mathlib3

mathlib3port

c3291da4

bump to nightly-2023-09-24-06

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

5655435f

Diff

@@ -3,7 +3,7 @@ Copyright (c) 2016 Leonardo de Moura. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Mathbin.Data.Set.Lattice
+import Data.Set.Lattice
 
 #align_import data.set.functor from "leanprover-community/mathlib"@"c3291da49cfa65f0d43b094750541c0731edc932"

c3291da4

bump to nightly-2023-07-20-09

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

9c56d0dd

Diff

@@ -2,14 +2,11 @@
 Copyright (c) 2016 Leonardo de Moura. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
-
-! This file was ported from Lean 3 source module data.set.functor
-! leanprover-community/mathlib commit c3291da49cfa65f0d43b094750541c0731edc932
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathbin.Data.Set.Lattice
 
+#align_import data.set.functor from "leanprover-community/mathlib"@"c3291da49cfa65f0d43b094750541c0731edc932"
+
 /-!
 # Functoriality of `set`

c3291da4

bump to nightly-2023-06-14-05

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

6c112b6f

Diff

@@ -75,8 +75,8 @@ instance : LawfulMonad Set where
   comp_map α β γ f g s := image_comp _ _ _
   pure_bind α β := biUnion_singleton
   bind_assoc α β γ s f g := by simp only [bind_def, bUnion_Union]
-  bind_pure_comp_eq_map α β f s := (image_eq_iUnion _ _).symm
-  bind_map_eq_seq α β s t := seq_def.symm
+  bind_pure_comp α β f s := (image_eq_iUnion _ _).symm
+  bind_map α β s t := seq_def.symm
 
 instance : CommApplicative (Set : Type u → Type u) :=
   ⟨fun α β s t => prod_image_seq_comm s t⟩

c3291da4

bump to nightly-2023-05-28-04

mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb

6797a637

Diff

@@ -66,9 +66,7 @@ theorem pure_def (a : α) : (pure a : Set α) = {a} :=
 /-- `set.image2` in terms of monadic operations. Note that this can't be taken as the definition
 because of the lack of universe polymorphism. -/
 theorem image2_def {α β γ : Type _} (f : α → β → γ) (s : Set α) (t : Set β) :
-    image2 f s t = f <$> s <*> t := by
-  ext
-  simp
+    image2 f s t = f <$> s <*> t := by ext; simp
 #align set.image2_def Set.image2_def
 -/

c3291da4

bump to nightly-2023-05-14-08

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

d31da313

Diff

@@ -75,9 +75,9 @@ theorem image2_def {α β γ : Type _} (f : α → β → γ) (s : Set α) (t :
 instance : LawfulMonad Set where
   id_map α := image_id
   comp_map α β γ f g s := image_comp _ _ _
-  pure_bind α β := bunionᵢ_singleton
+  pure_bind α β := biUnion_singleton
   bind_assoc α β γ s f g := by simp only [bind_def, bUnion_Union]
-  bind_pure_comp_eq_map α β f s := (image_eq_unionᵢ _ _).symm
+  bind_pure_comp_eq_map α β f s := (image_eq_iUnion _ _).symm
   bind_map_eq_seq α β s t := seq_def.symm
 
 instance : CommApplicative (Set : Type u → Type u) :=

c3291da4

bump to nightly-2023-02-21-16

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

1107b979

Changes in mathlib4

mathlib3

mathlib4

207cfac9

chore: remove autoImplicit from more files (#11798)

and reduce its scope in a few other instances. Mostly in CategoryTheory and Data this time; some Combinatorics also.

Co-authored-by: Richard Osborn <richardosborn@mac.com>

3bb1d613

Diff

@@ -16,8 +16,6 @@ import Mathlib.Lean.Expr.ExtraRecognizers
 This file defines the functor structure of `Set`.
 -/
 
-set_option autoImplicit true
-
 universe u
 
 open Function
@@ -89,19 +87,19 @@ instance : Alternative Set :=
 
 variable {β : Set α} {γ : Set β}
 
-theorem mem_coe_of_mem (ha : a ∈ β) (ha' : ⟨a, ha⟩ ∈ γ) : a ∈ (γ : Set α) :=
+theorem mem_coe_of_mem {a : α} (ha : a ∈ β) (ha' : ⟨a, ha⟩ ∈ γ) : a ∈ (γ : Set α) :=
   ⟨_, ⟨⟨_, rfl⟩, _, ⟨ha', rfl⟩, rfl⟩⟩
 
 theorem coe_subset : (γ : Set α) ⊆ β := by
   intro _ ⟨_, ⟨⟨⟨_, ha⟩, rfl⟩, _, ⟨_, rfl⟩, _⟩⟩; convert ha
 
-theorem mem_of_mem_coe (ha : a ∈ (γ : Set α)) : ⟨a, coe_subset ha⟩ ∈ γ := by
+theorem mem_of_mem_coe {a : α} (ha : a ∈ (γ : Set α)) : ⟨a, coe_subset ha⟩ ∈ γ := by
   rcases ha with ⟨_, ⟨_, rfl⟩, _, ⟨ha, rfl⟩, _⟩; convert ha
 
 theorem eq_univ_of_coe_eq (hγ : (γ : Set α) = β) : γ = univ :=
   eq_univ_of_forall fun ⟨_, ha⟩ => mem_of_mem_coe <| hγ.symm ▸ ha
 
-theorem image_coe_eq_restrict_image {f : α → δ} : f '' γ = β.restrict f '' γ :=
+theorem image_coe_eq_restrict_image {δ : Type*} {f : α → δ} : f '' γ = β.restrict f '' γ :=
   ext fun _ =>
     ⟨fun ⟨_, h, ha⟩ => ⟨_, mem_of_mem_coe h, ha⟩, fun ⟨_, h, ha⟩ => ⟨_, mem_coe_of_mem _ h, ha⟩⟩
 
@@ -140,7 +138,7 @@ theorem coe_eq_image_val (t : Set s) :
   ext
   simp
 
-variable {β : Set α} {γ : Set β}
+variable {β : Set α} {γ : Set β} {a : α}
 
 theorem mem_image_val_of_mem (ha : a ∈ β) (ha' : ⟨a, ha⟩ ∈ γ) : a ∈ (γ : Set α) :=
   ⟨_, ha', rfl⟩
@@ -154,7 +152,7 @@ theorem mem_of_mem_image_val (ha : a ∈ (γ : Set α)) : ⟨a, image_val_subset
 theorem eq_univ_of_image_val_eq (hγ : (γ : Set α) = β) : γ = univ :=
   eq_univ_of_forall fun ⟨_, ha⟩ => mem_of_mem_image_val <| hγ.symm ▸ ha
 
-theorem image_image_val_eq_restrict_image {f : α → δ} : f '' γ = β.restrict f '' γ := by
+theorem image_image_val_eq_restrict_image {δ : Type*} {f : α → δ} : f '' γ = β.restrict f '' γ := by
   ext; simp
 
 end Set
@@ -168,4 +166,4 @@ instance : Monad SetM := Set.monad
 
 /-- Evaluates the `SetM` monad, yielding a `Set`.
 Implementation note: this is the identity function. -/
-protected def SetM.run (s : SetM α) : Set α := s
+protected def SetM.run {α : Type*} (s : SetM α) : Set α := s

207cfac9

feat(Set): API for subset restriction and coercion to/from subtypes (#9940)

Api for subset restriction and coercion to/from subtypes

Co-authored-by: Miguel Marco <mmarco@unizar.es>

Co-authored-by: Miguel Marco <mmarco@unizar.es> Co-authored-by: Kyle Miller <kmill31415@gmail.com> Co-authored-by: mmarco <mmarco@kali> Co-authored-by: Winston Yin <winstonyin@gmail.com>

52762e24

Diff

@@ -6,6 +6,7 @@ Authors: Leonardo de Moura
 import Mathlib.Data.Set.Lattice
 import Mathlib.Init.Set
 import Mathlib.Control.Basic
+import Mathlib.Lean.Expr.ExtraRecognizers
 
 #align_import data.set.functor from "leanprover-community/mathlib"@"207cfac9fcd06138865b5d04f7091e46d9320432"
 
@@ -115,6 +116,23 @@ We define this coercion here.  -/
 /-- Coercion using `(Subtype.val '' ·)` -/
 instance : CoeHead (Set s) (Set α) := ⟨fun t => (Subtype.val '' t)⟩
 
+namespace Notation
+
+open Lean PrettyPrinter Delaborator SubExpr in
+/--
+If the `Set.Notation` namespace is open, sets of a subtype coerced to the ambient type are
+represented with `↑`.
+-/
+@[scoped delab app.Set.image]
+def delab_set_image_subtype : Delab := whenPPOption getPPCoercions do
+  let #[α, _, f, _] := (← getExpr).getAppArgs | failure
+  guard <| f.isAppOfArity ``Subtype.val 2
+  let some _ := α.coeTypeSet? | failure
+  let e ← withAppArg delab
+  `(↑$e)
+
+end Notation
+
 /-- The coercion from `Set.monad` as an instance is equal to the coercion defined above. -/
 theorem coe_eq_image_val (t : Set s) :
     @Lean.Internal.coeM Set s α _ Set.monad t = (t : Set α) := by

207cfac9

feat: make Set.monad not an instance and add (Subtype.val '' ·) coercion (#8413)

The monad instance on Set isn't computationally relevant, and it causes Lean's monad lifting coercion logic to activate. We introduce a coercion instance for the case that's actually used in practice: when s : Set X and t : Set s then (t : Set X) ought to be Subtype.val '' t. This way we do not see Lean.Internal.coeM terms.

If the monad is still wanted, it can be activated using a local attribute or by using the SetM.run function.

65ff2214

Diff

@@ -25,12 +25,22 @@ namespace Set
 
 variable {α β : Type u} {s : Set α} {f : α → Set β} {g : Set (α → β)}
 
-instance monad : Monad.{u} Set where
+/-- The `Set` functor is a monad.
+
+This is not a global instance because it does not have computational content,
+so it does not make much sense using `do` notation in general.
+Plus, this would cause monad-related coercions and monad lifting logic to become activated.
+Either use `attribute [local instance] Set.monad` to make it be a local instance
+or use `SetM.run do ...` when `do` notation is wanted. -/
+protected def monad : Monad.{u} Set where
   pure a := {a}
   bind s f := ⋃ i ∈ s, f i
   seq s t := Set.seq s (t ())
   map := Set.image
 
+section with_instance
+attribute [local instance] Set.monad
+
 @[simp]
 theorem bind_def : s >>= f = ⋃ i ∈ s, f i :=
   rfl
@@ -74,7 +84,7 @@ instance : Alternative Set :=
     orElse := fun s t => s ∪ (t ())
     failure := ∅ }
 
-/-! ## Monadic coercion lemmas -/
+/-! ### Monadic coercion lemmas -/
 
 variable {β : Set α} {γ : Set β}
 
@@ -94,4 +104,50 @@ theorem image_coe_eq_restrict_image {f : α → δ} : f '' γ = β.restrict f ''
   ext fun _ =>
     ⟨fun ⟨_, h, ha⟩ => ⟨_, mem_of_mem_coe h, ha⟩, fun ⟨_, h, ha⟩ => ⟨_, mem_coe_of_mem _ h, ha⟩⟩
 
+end with_instance
+
+/-! ### Coercion applying functoriality for `Subtype.val`
+
+The `Monad` instance gives a coercion using the internal function `Lean.Internal.coeM`.
+In practice this is only used for applying the `Set` functor to `Subtype.val`.
+We define this coercion here.  -/
+
+/-- Coercion using `(Subtype.val '' ·)` -/
+instance : CoeHead (Set s) (Set α) := ⟨fun t => (Subtype.val '' t)⟩
+
+/-- The coercion from `Set.monad` as an instance is equal to the coercion defined above. -/
+theorem coe_eq_image_val (t : Set s) :
+    @Lean.Internal.coeM Set s α _ Set.monad t = (t : Set α) := by
+  change ⋃ (x ∈ t), {x.1} = _
+  ext
+  simp
+
+variable {β : Set α} {γ : Set β}
+
+theorem mem_image_val_of_mem (ha : a ∈ β) (ha' : ⟨a, ha⟩ ∈ γ) : a ∈ (γ : Set α) :=
+  ⟨_, ha', rfl⟩
+
+theorem image_val_subset : (γ : Set α) ⊆ β := by
+  rintro _ ⟨⟨_, ha⟩, _, rfl⟩; exact ha
+
+theorem mem_of_mem_image_val (ha : a ∈ (γ : Set α)) : ⟨a, image_val_subset ha⟩ ∈ γ := by
+  rcases ha with ⟨_, ha, rfl⟩; exact ha
+
+theorem eq_univ_of_image_val_eq (hγ : (γ : Set α) = β) : γ = univ :=
+  eq_univ_of_forall fun ⟨_, ha⟩ => mem_of_mem_image_val <| hγ.symm ▸ ha
+
+theorem image_image_val_eq_restrict_image {f : α → δ} : f '' γ = β.restrict f '' γ := by
+  ext; simp
+
 end Set
+
+/-! ### Wrapper to enable the `Set` monad -/
+
+/-- This is `Set` but with a `Monad` instance. -/
+def SetM (α : Type u) := Set α
+
+instance : Monad SetM := Set.monad
+
+/-- Evaluates the `SetM` monad, yielding a `Set`.
+Implementation note: this is the identity function. -/
+protected def SetM.run (s : SetM α) : Set α := s

207cfac9

chore: remove many Type _ before the colon (#7718)

We have turned to Type* instead of Type _, but many of them remained in mathlib because the straight replacement did not work. In general, having Type _ before the colon is a code smell, though, as it hides which types should be in the same universe and which shouldn't, and is not very robust.

This PR replaces most of the remaining Type _ before the colon (except those in category theory) by Type* or Type u. This has uncovered a few bugs (where declarations were not as polymorphic as they should be).

I had to increase heartbeats at two places when replacing Type _ by Type*, but I think it's worth it as it's really more robust.

fe9572d2

Diff

@@ -53,7 +53,7 @@ theorem pure_def (a : α) : (pure a : Set α) = {a} :=
 
 /-- `Set.image2` in terms of monadic operations. Note that this can't be taken as the definition
 because of the lack of universe polymorphism. -/
-theorem image2_def {α β γ : Type _} (f : α → β → γ) (s : Set α) (t : Set β) :
+theorem image2_def {α β γ : Type u} (f : α → β → γ) (s : Set α) (t : Set β) :
     image2 f s t = f <$> s <*> t := by
   ext
   simp

207cfac9

fix: disable autoImplicit globally (#6528)

Autoimplicits are highly controversial and also defeat the performance-improving work in #6474.

The intent of this PR is to make autoImplicit opt-in on a per-file basis, by disabling it in the lakefile and enabling it again with set_option autoImplicit true in the few files that rely on it.

That also keeps this PR small, as opposed to attempting to "fix" files to not need it any more.

I claim that many of the uses of autoImplicit in these files are accidental; situations such as:

Assuming variables are in scope, but pasting the lemma in the wrong section
Pasting in a lemma from a scratch file without checking to see if the variable names are consistent with the rest of the file
Making a copy-paste error between lemmas and forgetting to add an explicit arguments.

Having set_option autoImplicit false as the default prevents these types of mistake being made in the 90% of files where autoImplicits are not used at all, and causes them to be caught by CI during review.

I think there were various points during the port where we encouraged porters to delete the universes u v lines; I think having autoparams for universe variables only would cover a lot of the cases we actually use them, while avoiding any real shortcomings.

A Zulip poll (after combining overlapping votes accordingly) was in favor of this change with 5:5:18 as the no:dontcare:yes vote ratio.

While this PR was being reviewed, a handful of files gained some more likely-accidental autoImplicits. In these places, set_option autoImplicit true has been placed locally within a section, rather than at the top of the file.

0c24f831

Diff

@@ -15,6 +15,8 @@ import Mathlib.Control.Basic
 This file defines the functor structure of `Set`.
 -/
 
+set_option autoImplicit true
+
 universe u
 
 open Function

207cfac9

feat(Topology/ExtremallyDisconnected): prove Gleason's theorem (#5634)

This work was done during the 2023 Copenhagen masterclass on formalisation of condensed mathematics. Numerous participants contributed.

Co-authored-by: Filippo A E Nuccio <filippo.nuccio@univ-st-etienne.fr> Co-authored-by: Dagur Ásgeirsson <dagurtomas@gmail.com> Co-authored-by: Nikolas Kuhn <nikolaskuhn@gmx.de>

a2c34345

Diff

@@ -72,4 +72,24 @@ instance : Alternative Set :=
     orElse := fun s t => s ∪ (t ())
     failure := ∅ }
 
+/-! ## Monadic coercion lemmas -/
+
+variable {β : Set α} {γ : Set β}
+
+theorem mem_coe_of_mem (ha : a ∈ β) (ha' : ⟨a, ha⟩ ∈ γ) : a ∈ (γ : Set α) :=
+  ⟨_, ⟨⟨_, rfl⟩, _, ⟨ha', rfl⟩, rfl⟩⟩
+
+theorem coe_subset : (γ : Set α) ⊆ β := by
+  intro _ ⟨_, ⟨⟨⟨_, ha⟩, rfl⟩, _, ⟨_, rfl⟩, _⟩⟩; convert ha
+
+theorem mem_of_mem_coe (ha : a ∈ (γ : Set α)) : ⟨a, coe_subset ha⟩ ∈ γ := by
+  rcases ha with ⟨_, ⟨_, rfl⟩, _, ⟨ha, rfl⟩, _⟩; convert ha
+
+theorem eq_univ_of_coe_eq (hγ : (γ : Set α) = β) : γ = univ :=
+  eq_univ_of_forall fun ⟨_, ha⟩ => mem_of_mem_coe <| hγ.symm ▸ ha
+
+theorem image_coe_eq_restrict_image {f : α → δ} : f '' γ = β.restrict f '' γ :=
+  ext fun _ =>
+    ⟨fun ⟨_, h, ha⟩ => ⟨_, mem_of_mem_coe h, ha⟩, fun ⟨_, h, ha⟩ => ⟨_, mem_coe_of_mem _ h, ha⟩⟩
+
 end Set

207cfac9

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) 2016 Leonardo de Moura. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
-
-! This file was ported from Lean 3 source module data.set.functor
-! leanprover-community/mathlib commit 207cfac9fcd06138865b5d04f7091e46d9320432
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.Data.Set.Lattice
 import Mathlib.Init.Set
 import Mathlib.Control.Basic
 
+#align_import data.set.functor from "leanprover-community/mathlib"@"207cfac9fcd06138865b5d04f7091e46d9320432"
+
 /-!
 # Functoriality of `Set`

207cfac9

chore: Rename to sSup/iSup (#3938)

As discussed on Zulip

Renames

supₛ → sSup
infₛ → sInf
supᵢ → iSup
infᵢ → iInf
bsupₛ → bsSup
binfₛ → bsInf
bsupᵢ → biSup
binfᵢ → biInf
csupₛ → csSup
cinfₛ → csInf
csupᵢ → ciSup
cinfᵢ → ciInf
unionₛ → sUnion
interₛ → sInter
unionᵢ → iUnion
interᵢ → iInter
bunionₛ → bsUnion
binterₛ → bsInter
bunionᵢ → biUnion
binterᵢ → biInter

Co-authored-by: Parcly Taxel <reddeloostw@gmail.com>

d1eb6264

Diff

@@ -62,9 +62,9 @@ theorem image2_def {α β γ : Type _} (f : α → β → γ) (s : Set α) (t :
 
 instance : LawfulMonad Set := LawfulMonad.mk'
   (id_map := image_id)
-  (pure_bind := bunionᵢ_singleton)
-  (bind_assoc := fun _ _ _ => by simp only [bind_def, bunionᵢ_unionᵢ])
-  (bind_pure_comp := fun _ _ => (image_eq_unionᵢ _ _).symm)
+  (pure_bind := biUnion_singleton)
+  (bind_assoc := fun _ _ _ => by simp only [bind_def, biUnion_iUnion])
+  (bind_pure_comp := fun _ _ => (image_eq_iUnion _ _).symm)
   (bind_map := fun _ _ => seq_def.symm)
 
 instance : CommApplicative (Set : Type u → Type u) :=

207cfac9

chore: remove set_option autoImplicit false (#1608)

These were mostly added in the process of porting and weren't removed at the end. There was one that may have been needed, let's see what CI says.

4535a7d1

Diff

@@ -18,8 +18,6 @@ import Mathlib.Control.Basic
 This file defines the functor structure of `Set`.
 -/
 
-set_option autoImplicit false
-
 universe u
 
 open Function

207cfac9

feat: port Data.Set.Functor (#1178)

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>

25a1ad4b

`data.set.functor` ⟷ `Mathlib.Data.Set.Functor`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Renames

Dependencies 59

data.set.functor ⟷ Mathlib.Data.Set.Functor

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Renames

Dependencies 59

`data.set.functor` ⟷ `Mathlib.Data.Set.Functor`