data.erased | 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

10b4e499

(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) 2018 Mario Carneiro. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Mario Carneiro
 -/
-import Mathbin.Logic.Equiv.Defs
+import Logic.Equiv.Defs
 
 #align_import data.erased 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) 2018 Mario Carneiro. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Mario Carneiro
-
-! This file was ported from Lean 3 source module data.erased
-! 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.Logic.Equiv.Defs
 
+#align_import data.erased from "leanprover-community/mathlib"@"c3291da49cfa65f0d43b094750541c0731edc932"
+
 /-!
 # A type for VM-erased data

c3291da4

bump to nightly-2023-06-13-21

mathlib commit https://github.com/leanprover-community/mathlib/commit/9fb8964792b4237dac6200193a0d533f1b3f7423

829520ac

Diff

@@ -136,10 +136,12 @@ def bind {α β} (a : Erased α) (f : α → Erased β) : Erased β :=
 #align erased.bind Erased.bind
 -/
 
+#print Erased.bind_eq_out /-
 @[simp]
 theorem bind_eq_out {α β} (a f) : @bind α β a f = f a.out := by
   delta bind bind._proof_1 <;> cases f a.out <;> rfl
 #align erased.bind_eq_out Erased.bind_eq_out
+-/
 
 #print Erased.join /-
 /-- Collapses two levels of erasure.
@@ -167,9 +169,11 @@ def map {α β} (f : α → β) (a : Erased α) : Erased β :=
 #align erased.map Erased.map
 -/
 
+#print Erased.map_out /-
 @[simp]
 theorem map_out {α β} {f : α → β} (a : Erased α) : (a.map f).out = f a.out := by simp [map]
 #align erased.map_out Erased.map_out
+-/
 
 instance : Monad Erased where
   pure := @mk

c3291da4

bump to nightly-2023-06-01-16

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

b9c87c70

Diff

@@ -30,7 +30,7 @@ universe u
   and proofs. This can be used to track data without storing it
   literally. -/
 def Erased (α : Sort u) : Sort max 1 u :=
-  Σ's : α → Prop, ∃ a, (fun b => a = b) = s
+  Σ' s : α → Prop, ∃ a, (fun b => a = b) = s
 #align erased Erased
 -/

c3291da4

bump to nightly-2023-05-28-06

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

ba5d8b97

Diff

@@ -136,12 +136,6 @@ def bind {α β} (a : Erased α) (f : α → Erased β) : Erased β :=
 #align erased.bind Erased.bind
 -/
 
-/- warning: erased.bind_eq_out -> Erased.bind_eq_out is a dubious translation:
-lean 3 declaration is
-  forall {α : Sort.{u1}} {β : Sort.{u2}} (a : Erased.{u1} α) (f : α -> (Erased.{u2} β)), Eq.{max 1 u2} (Erased.{u2} β) (Erased.bind.{u1, u2} α β a f) (f (Erased.out.{u1} α a))
-but is expected to have type
-  forall {α : Sort.{u2}} {β : Sort.{u1}} (a : Erased.{u2} α) (f : α -> (Erased.{u1} β)), Eq.{max 1 u1} (Erased.{u1} β) (Erased.bind.{u2, u1} α β a f) (f (Erased.out.{u2} α a))
-Case conversion may be inaccurate. Consider using '#align erased.bind_eq_out Erased.bind_eq_outₓ'. -/
 @[simp]
 theorem bind_eq_out {α β} (a f) : @bind α β a f = f a.out := by
   delta bind bind._proof_1 <;> cases f a.out <;> rfl
@@ -173,12 +167,6 @@ def map {α β} (f : α → β) (a : Erased α) : Erased β :=
 #align erased.map Erased.map
 -/
 
-/- warning: erased.map_out -> Erased.map_out is a dubious translation:
-lean 3 declaration is
-  forall {α : Sort.{u1}} {β : Sort.{u2}} {f : α -> β} (a : Erased.{u1} α), Eq.{u2} β (Erased.out.{u2} β (Erased.map.{u1, u2} α β f a)) (f (Erased.out.{u1} α a))
-but is expected to have type
-  forall {α : Sort.{u2}} {β : Sort.{u1}} {f : α -> β} (a : Erased.{u2} α), Eq.{u1} β (Erased.out.{u1} β (Erased.map.{u2, u1} α β f a)) (f (Erased.out.{u2} α a))
-Case conversion may be inaccurate. Consider using '#align erased.map_out Erased.map_outₓ'. -/
 @[simp]
 theorem map_out {α β} {f : α → β} (a : Erased α) : (a.map f).out = f a.out := by simp [map]
 #align erased.map_out Erased.map_out

c3291da4

bump to nightly-2023-02-21-16

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

1107b979

Changes in mathlib4

mathlib3

mathlib4

10b4e499

chore: squeeze some non-terminal simps (#11247)

This PR accompanies #11246, squeezing some non-terminal simps highlighted by the linter until I decided to stop!

1ad8c3fe

Diff

@@ -62,7 +62,7 @@ theorem out_mk {α} (a : α) : (mk a).out = a := by
 
 @[simp]
 theorem mk_out {α} : ∀ a : Erased α, mk (out a) = a
-  | ⟨s, h⟩ => by simp [mk]; congr; exact Classical.choose_spec h
+  | ⟨s, h⟩ => by simp only [mk]; congr; exact Classical.choose_spec h
 #align erased.mk_out Erased.mk_out
 
 @[ext]

10b4e499

chore: move Mathlib to v4.7.0-rc1 (#11162)

This is a very large PR, but it has been reviewed piecemeal already in PRs to the bump/v4.7.0 branch as we update to intermediate nightlies.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Kyle Miller <kmill31415@gmail.com> Co-authored-by: damiano <adomani@gmail.com>

fa48894a

Diff

@@ -154,9 +154,8 @@ theorem map_def {α β} : ((· <$> ·) : (α → β) → Erased α → Erased β
 #align erased.map_def Erased.map_def
 
 -- Porting note: Old proof `by refine' { .. } <;> intros <;> ext <;> simp`
-protected instance LawfulMonad : LawfulMonad Erased :=
-  { Erased.Monad with
-    id_map := by intros; ext; simp
+protected instance instLawfulMonad : LawfulMonad Erased :=
+  { id_map := by intros; ext; simp
     map_const := by intros; ext; simp [Functor.mapConst]
     pure_bind := by intros; ext; simp
     bind_assoc := by intros; ext; simp

10b4e499

style: homogenise porting notes (#11145)

Homogenises porting notes via capitalisation and addition of whitespace.

It makes the following changes:

converts "--porting note" into "-- Porting note";
converts "porting note" into "Porting note".

8be0b69c

Diff

@@ -153,7 +153,7 @@ theorem map_def {α β} : ((· <$> ·) : (α → β) → Erased α → Erased β
   rfl
 #align erased.map_def Erased.map_def
 
---Porting note: Old proof `by refine' { .. } <;> intros <;> ext <;> simp`
+-- Porting note: Old proof `by refine' { .. } <;> intros <;> ext <;> simp`
 protected instance LawfulMonad : LawfulMonad Erased :=
   { Erased.Monad with
     id_map := by intros; ext; simp

10b4e499

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,14 +2,11 @@
 Copyright (c) 2018 Mario Carneiro. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Mario Carneiro
-
-! This file was ported from Lean 3 source module data.erased
-! leanprover-community/mathlib commit 10b4e499f43088dd3bb7b5796184ad5216648ab1
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.Logic.Equiv.Defs
 
+#align_import data.erased from "leanprover-community/mathlib"@"10b4e499f43088dd3bb7b5796184ad5216648ab1"
+
 /-!
 # A type for VM-erased data

10b4e499

chore: remove occurrences of semicolon after space (#5713)

This is the second half of the changes originally in #5699, removing all occurrences of ; after a space and implementing a linter rule to enforce it.

In most cases this 2-character substring has a space after it, so the following command was run first:

find . -type f -name "*.lean" -exec sed -i -E 's/ ; /; /g' {} \;

The remaining cases were few enough in number that they were done manually.

c795bd35

Diff

@@ -65,7 +65,7 @@ theorem out_mk {α} (a : α) : (mk a).out = a := by
 
 @[simp]
 theorem mk_out {α} : ∀ a : Erased α, mk (out a) = a
-  | ⟨s, h⟩ => by simp [mk] ; congr ; exact Classical.choose_spec h
+  | ⟨s, h⟩ => by simp [mk]; congr; exact Classical.choose_spec h
 #align erased.mk_out Erased.mk_out
 
 @[ext]
@@ -159,14 +159,14 @@ theorem map_def {α β} : ((· <$> ·) : (α → β) → Erased α → Erased β
 --Porting note: Old proof `by refine' { .. } <;> intros <;> ext <;> simp`
 protected instance LawfulMonad : LawfulMonad Erased :=
   { Erased.Monad with
-    id_map := by intros ; ext ; simp
-    map_const := by intros ; ext ; simp [Functor.mapConst]
-    pure_bind := by intros ; ext ; simp
-    bind_assoc := by intros ; ext ; simp
-    bind_pure_comp := by intros ; ext ; simp
-    bind_map := by intros ; ext ; simp [Seq.seq]
-    seqLeft_eq := by intros ; ext ; simp [Seq.seq, Functor.mapConst, SeqLeft.seqLeft]
-    seqRight_eq := by intros ; ext ; simp [Seq.seq, Functor.mapConst, SeqRight.seqRight]
-    pure_seq := by intros ; ext ; simp [Seq.seq, Functor.mapConst, SeqRight.seqRight] }
+    id_map := by intros; ext; simp
+    map_const := by intros; ext; simp [Functor.mapConst]
+    pure_bind := by intros; ext; simp
+    bind_assoc := by intros; ext; simp
+    bind_pure_comp := by intros; ext; simp
+    bind_map := by intros; ext; simp [Seq.seq]
+    seqLeft_eq := by intros; ext; simp [Seq.seq, Functor.mapConst, SeqLeft.seqLeft]
+    seqRight_eq := by intros; ext; simp [Seq.seq, Functor.mapConst, SeqRight.seqRight]
+    pure_seq := by intros; ext; simp [Seq.seq, Functor.mapConst, SeqRight.seqRight] }
 
 end Erased

10b4e499

chore: tidy various files (#1145)

2a588a7d

Diff

@@ -72,7 +72,7 @@ theorem mk_out {α} : ∀ a : Erased α, mk (out a) = a
 theorem out_inj {α} (a b : Erased α) (h : a.out = b.out) : a = b := by simpa using congr_arg mk h
 #align erased.out_inj Erased.out_inj
 
-/-- Equivalence between `erased α` and `α`. -/
+/-- Equivalence between `Erased α` and `α`. -/
 noncomputable def equiv (α) : Erased α ≃ α :=
   ⟨out, mk, mk_out, out_mk⟩
 #align erased.equiv Erased.equiv

10b4e499

feat port: Data.Erased (#937)

10b4e499

One instance at the end is a bit longer because we don't have refine' { .. }. No other issues

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

27379733

`data.erased` ⟷ `Mathlib.Data.Erased`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 10

data.erased ⟷ Mathlib.Data.Erased

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 10

`data.erased` ⟷ `Mathlib.Data.Erased`