data.option.defs | 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

c4658a64

(last sync)

Changes in mathlib3port

mathlib3

mathlib3port

448144f7

bump to nightly-2024-02-23-08

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

ac9421d6

Diff

@@ -159,15 +159,15 @@ def liftOrGet (f : α → α → α) : Option α → Option α → Option α
 
 #print Option.liftOrGet_isCommutative /-
 -- lift f
-instance liftOrGet_isCommutative (f : α → α → α) [h : IsCommutative α f] :
-    IsCommutative (Option α) (liftOrGet f) :=
+instance liftOrGet_isCommutative (f : α → α → α) [h : Std.Commutative α f] :
+    Std.Commutative (Option α) (liftOrGet f) :=
   ⟨fun a b => by cases a <;> cases b <;> simp [lift_or_get, h.comm]⟩
 #align option.lift_or_get_comm Option.liftOrGet_isCommutative
 -/
 
 #print Option.liftOrGet_isAssociative /-
-instance liftOrGet_isAssociative (f : α → α → α) [h : IsAssociative α f] :
-    IsAssociative (Option α) (liftOrGet f) :=
+instance liftOrGet_isAssociative (f : α → α → α) [h : Std.Associative α f] :
+    Std.Associative (Option α) (liftOrGet f) :=
   ⟨fun a b c => by cases a <;> cases b <;> cases c <;> simp [lift_or_get, h.assoc]⟩
 #align option.lift_or_get_assoc Option.liftOrGet_isAssociative
 -/

448144f7

bump to nightly-2024-02-05-08

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

516c6ec2

Diff

@@ -173,22 +173,24 @@ instance liftOrGet_isAssociative (f : α → α → α) [h : IsAssociative α f]
 -/
 
 #print Option.liftOrGet_isIdempotent /-
-instance liftOrGet_isIdempotent (f : α → α → α) [h : IsIdempotent α f] :
-    IsIdempotent (Option α) (liftOrGet f) :=
+instance liftOrGet_isIdempotent (f : α → α → α) [h : Std.IdempotentOp α f] :
+    Std.IdempotentOp (Option α) (liftOrGet f) :=
   ⟨fun a => by cases a <;> simp [lift_or_get, h.idempotent]⟩
 #align option.lift_or_get_idem Option.liftOrGet_isIdempotent
 -/
 
-#print Option.liftOrGet_isLeftId /-
-instance liftOrGet_isLeftId (f : α → α → α) : IsLeftId (Option α) (liftOrGet f) none :=
+#print Option.liftOrGet_isId /-
+instance liftOrGet_isId (f : α → α → α) : Std.LawfulLeftIdentity (Option α) (liftOrGet f) none :=
   ⟨fun a => by cases a <;> simp [lift_or_get]⟩
-#align option.lift_or_get_is_left_id Option.liftOrGet_isLeftId
+#align option.lift_or_get_is_left_id Option.liftOrGet_isId
 -/
 
-#print Option.liftOrGet_isRightId /-
-instance liftOrGet_isRightId (f : α → α → α) : IsRightId (Option α) (liftOrGet f) none :=
+/- warning: option.lift_or_get_is_right_id clashes with option.lift_or_get_is_left_id -> Option.liftOrGet_isId
+Case conversion may be inaccurate. Consider using '#align option.lift_or_get_is_right_id Option.liftOrGet_isIdₓ'. -/
+#print Option.liftOrGet_isId /-
+instance liftOrGet_isId (f : α → α → α) : Std.LawfulRightIdentity (Option α) (liftOrGet f) none :=
   ⟨fun a => by cases a <;> simp [lift_or_get]⟩
-#align option.lift_or_get_is_right_id Option.liftOrGet_isRightId
+#align option.lift_or_get_is_right_id Option.liftOrGet_isId
 -/
 
 #print Option.Rel /-

448144f7

bump to nightly-2023-12-23-06

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

b8c74971

Diff

@@ -241,22 +241,22 @@ protected def traverse.{u, v} {F : Type u → Type v} [Applicative F] {α β : T
 #align option.traverse Option.traverse
 -/
 
-#print Option.maybe /-
+#print Option.sequence /-
 -- By analogy with `monad.sequence` in `init/category/combinators.lean`.
 /-- If you maybe have a monadic computation in a `[monad m]` which produces a term of type `α`, then
 there is a naturally associated way to always perform a computation in `m` which maybe produces a
 result. -/
-def maybe.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α) → m (Option α)
+def sequence.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α) → m (Option α)
   | none => return none
   | some fn => some <$> fn
-#align option.maybe Option.maybe
+#align option.maybe Option.sequence
 -/
 
 #print Option.mapM /-
 /-- Map a monadic function `f : α → m β` over an `o : option α`, maybe producing a result. -/
 def mapM.{u, v, w} {m : Type u → Type v} [Monad m] {α : Type w} {β : Type u} (f : α → m β)
     (o : Option α) : m (Option β) :=
-  (o.map f).maybe
+  (o.map f).sequence
 #align option.mmap Option.mapM
 -/

448144f7

bump to nightly-2023-07-20-09

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

9c56d0dd

Diff

@@ -2,13 +2,10 @@
 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.option.defs
-! leanprover-community/mathlib commit 448144f7ae193a8990cb7473c9e9a01990f64ac7
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 
+#align_import data.option.defs from "leanprover-community/mathlib"@"448144f7ae193a8990cb7473c9e9a01990f64ac7"
+
 /-!
 # Extra definitions on `option`

448144f7

bump to nightly-2023-06-13-21

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

829520ac

Diff

@@ -90,11 +90,13 @@ instance decidableForallMem {p : α → Prop} [DecidablePred p] :
 #align option.decidable_forall_mem Option.decidableForallMem
 -/
 
+#print Option.decidableExistsMem /-
 instance decidableExistsMem {p : α → Prop} [DecidablePred p] :
     ∀ o : Option α, Decidable (∃ a ∈ o, p a)
   | none => isFalse fun ⟨a, ⟨h, _⟩⟩ => by cases h
   | some a => if h : p a then isTrue <| ⟨_, rfl, h⟩ else isFalse fun ⟨_, ⟨rfl, hn⟩⟩ => h hn
 #align option.decidable_exists_mem Option.decidableExistsMem
+-/
 
 #print Option.iget /-
 /-- Inhabited `get` function. Returns `a` if the input is `some a`, otherwise returns `default`. -/
@@ -119,10 +121,12 @@ def guard (p : α → Prop) [DecidablePred p] (a : α) : Option α :=
 #align option.guard Option.guard
 -/
 
+#print Option.filter /-
 /-- `filter p o` returns `some a` if `o` is `some a` and `p a` holds, otherwise `none`. -/
 def filter (p : α → Prop) [DecidablePred p] (o : Option α) : Option α :=
   o.bind (guard p)
 #align option.filter Option.filter
+-/
 
 #print Option.toList /-
 /-- Cast of `option` to `list `. Returns `[a]` if the input is `some a`, and `[]` if it is
@@ -251,22 +255,28 @@ def maybe.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α)
 #align option.maybe Option.maybe
 -/
 
+#print Option.mapM /-
 /-- Map a monadic function `f : α → m β` over an `o : option α`, maybe producing a result. -/
 def mapM.{u, v, w} {m : Type u → Type v} [Monad m] {α : Type w} {β : Type u} (f : α → m β)
     (o : Option α) : m (Option β) :=
   (o.map f).maybe
 #align option.mmap Option.mapM
+-/
 
+#print Option.elimM /-
 /-- A monadic analogue of `option.elim`. -/
 def elimM {α β : Type _} {m : Type _ → Type _} [Monad m] (y : m β) (z : α → m β)
     (x : m (Option α)) : m β :=
   x >>= Option.elim' y z
 #align option.melim Option.elimM
+-/
 
+#print Option.getDM' /-
 /-- A monadic analogue of `option.get_or_else`. -/
 def getDM' {α : Type _} {m : Type _ → Type _} [Monad m] (x : m (Option α)) (y : m α) : m α :=
   elimM y pure x
 #align option.mget_or_else Option.getDM'
+-/
 
 end Option

448144f7

bump to nightly-2023-05-28-06

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

ba5d8b97

Diff

@@ -90,12 +90,6 @@ instance decidableForallMem {p : α → Prop} [DecidablePred p] :
 #align option.decidable_forall_mem Option.decidableForallMem
 -/
 
-/- warning: option.decidable_exists_mem -> Option.decidableExistsMem is a dubious translation:
-lean 3 declaration is
-  forall {α : Type.{u1}} {p : α -> Prop} [_inst_1 : DecidablePred.{succ u1} α p] (o : Option.{u1} α), Decidable (Exists.{succ u1} α (fun (a : α) => Exists.{0} (Membership.Mem.{u1, u1} α (Option.{u1} α) (Option.hasMem.{u1} α) a o) (fun (H : Membership.Mem.{u1, u1} α (Option.{u1} α) (Option.hasMem.{u1} α) a o) => p a)))
-but is expected to have type
-  forall {α : Type.{u1}} {p : α -> Prop} [_inst_1 : DecidablePred.{succ u1} α p] (o : Option.{u1} α), Decidable (Exists.{succ u1} α (fun (a : α) => And (Membership.mem.{u1, u1} α (Option.{u1} α) (Option.instMembershipOption.{u1} α) a o) (p a)))
-Case conversion may be inaccurate. Consider using '#align option.decidable_exists_mem Option.decidableExistsMemₓ'. -/
 instance decidableExistsMem {p : α → Prop} [DecidablePred p] :
     ∀ o : Option α, Decidable (∃ a ∈ o, p a)
   | none => isFalse fun ⟨a, ⟨h, _⟩⟩ => by cases h
@@ -125,12 +119,6 @@ def guard (p : α → Prop) [DecidablePred p] (a : α) : Option α :=
 #align option.guard Option.guard
 -/
 
-/- warning: option.filter -> Option.filter is a dubious translation:
-lean 3 declaration is
-  forall {α : Type.{u1}} (p : α -> Prop) [_inst_1 : DecidablePred.{succ u1} α p], (Option.{u1} α) -> (Option.{u1} α)
-but is expected to have type
-  forall {α : Type.{u1}}, (α -> Bool) -> (Option.{u1} α) -> (Option.{u1} α)
-Case conversion may be inaccurate. Consider using '#align option.filter Option.filterₓ'. -/
 /-- `filter p o` returns `some a` if `o` is `some a` and `p a` holds, otherwise `none`. -/
 def filter (p : α → Prop) [DecidablePred p] (o : Option α) : Option α :=
   o.bind (guard p)
@@ -263,36 +251,18 @@ def maybe.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α)
 #align option.maybe Option.maybe
 -/
 
-/- warning: option.mmap -> Option.mapM is a dubious translation:
-lean 3 declaration is
-  forall {m : Type.{u1} -> Type.{u2}} [_inst_1 : Monad.{u1, u2} m] {α : Type.{u3}} {β : Type.{u1}}, (α -> (m β)) -> (Option.{u3} α) -> (m (Option.{u1} β))
-but is expected to have type
-  forall {m : Type.{u1} -> Type.{u2}} {_inst_1 : Type.{u3}} {α : Type.{u1}} [β : Monad.{u1, u2} m], (_inst_1 -> (m α)) -> (Option.{u3} _inst_1) -> (m (Option.{u1} α))
-Case conversion may be inaccurate. Consider using '#align option.mmap Option.mapMₓ'. -/
 /-- Map a monadic function `f : α → m β` over an `o : option α`, maybe producing a result. -/
 def mapM.{u, v, w} {m : Type u → Type v} [Monad m] {α : Type w} {β : Type u} (f : α → m β)
     (o : Option α) : m (Option β) :=
   (o.map f).maybe
 #align option.mmap Option.mapM
 
-/- warning: option.melim -> Option.elimM is a dubious translation:
-lean 3 declaration is
-  forall {α : Type.{u1}} {β : Type.{u1}} {m : Type.{u1} -> Type.{u2}} [_inst_1 : Monad.{u1, u2} m], (m β) -> (α -> (m β)) -> (m (Option.{u1} α)) -> (m β)
-but is expected to have type
-  forall {α : Type.{u1} -> Type.{u2}} {β : Type.{u1}} {m : Type.{u1}} [_inst_1 : Monad.{u1, u2} α], (α (Option.{u1} β)) -> (α m) -> (β -> (α m)) -> (α m)
-Case conversion may be inaccurate. Consider using '#align option.melim Option.elimMₓ'. -/
 /-- A monadic analogue of `option.elim`. -/
 def elimM {α β : Type _} {m : Type _ → Type _} [Monad m] (y : m β) (z : α → m β)
     (x : m (Option α)) : m β :=
   x >>= Option.elim' y z
 #align option.melim Option.elimM
 
-/- warning: option.mget_or_else -> Option.getDM' is a dubious translation:
-lean 3 declaration is
-  forall {α : Type.{u1}} {m : Type.{u1} -> Type.{u2}} [_inst_1 : Monad.{u1, u2} m], (m (Option.{u1} α)) -> (m α) -> (m α)
-but is expected to have type
-  forall {α : Type.{u1} -> Type.{u2}} {m : Type.{u1}} [_inst_1 : Monad.{u1, u2} α], (α (Option.{u1} m)) -> (α m) -> (α m)
-Case conversion may be inaccurate. Consider using '#align option.mget_or_else Option.getDM'ₓ'. -/
 /-- A monadic analogue of `option.get_or_else`. -/
 def getDM' {α : Type _} {m : Type _ → Type _} [Monad m] (x : m (Option α)) (y : m α) : m α :=
   elimM y pure x

448144f7

bump to nightly-2023-03-09-06

mathlib commit https://github.com/leanprover-community/mathlib/commit/21e3562c5e12d846c7def5eff8cdbc520d7d4936

f7832a92

Diff

@@ -287,16 +287,16 @@ def elimM {α β : Type _} {m : Type _ → Type _} [Monad m] (y : m β) (z : α
   x >>= Option.elim' y z
 #align option.melim Option.elimM
 
-/- warning: option.mget_or_else -> Option.getDM is a dubious translation:
+/- warning: option.mget_or_else -> Option.getDM' is a dubious translation:
 lean 3 declaration is
   forall {α : Type.{u1}} {m : Type.{u1} -> Type.{u2}} [_inst_1 : Monad.{u1, u2} m], (m (Option.{u1} α)) -> (m α) -> (m α)
 but is expected to have type
   forall {α : Type.{u1} -> Type.{u2}} {m : Type.{u1}} [_inst_1 : Monad.{u1, u2} α], (α (Option.{u1} m)) -> (α m) -> (α m)
-Case conversion may be inaccurate. Consider using '#align option.mget_or_else Option.getDMₓ'. -/
+Case conversion may be inaccurate. Consider using '#align option.mget_or_else Option.getDM'ₓ'. -/
 /-- A monadic analogue of `option.get_or_else`. -/
-def getDM {α : Type _} {m : Type _ → Type _} [Monad m] (x : m (Option α)) (y : m α) : m α :=
+def getDM' {α : Type _} {m : Type _ → Type _} [Monad m] (x : m (Option α)) (y : m α) : m α :=
   elimM y pure x
-#align option.mget_or_else Option.getDM
+#align option.mget_or_else Option.getDM'
 
 end Option

448144f7

bump to nightly-2023-02-21-16

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

1107b979

Changes in mathlib4

mathlib3

mathlib4

c4658a64

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

@@ -17,8 +17,6 @@ files under `Mathlib.Data.Option`.
 Other basic operations on `Option` are defined in the core library.
 -/
 
-set_option autoImplicit true
-
 namespace Option
 
 #align option.lift_or_get Option.liftOrGet
@@ -36,6 +34,7 @@ protected def traverse.{u, v}
 #align option.mmap Option.mapM
 #align option.melim Option.elimM
 
+set_option autoImplicit true in
 @[deprecated getDM]
 protected def getDM' [Monad m] (x : m (Option α)) (y : m α) : m α := do
   (← x).getDM y
@@ -55,7 +54,7 @@ protected def elim' (b : β) (f : α → β) : Option α → β
 @[simp]
 theorem elim'_none (b : β) (f : α → β) : Option.elim' b f none = b := rfl
 @[simp]
-theorem elim'_some (b : β) (f : α → β) : Option.elim' b f (some a) = f a := rfl
+theorem elim'_some {a : α} (b : β) (f : α → β) : Option.elim' b f (some a) = f a := rfl
 
 -- Porting note: this lemma was introduced because it is necessary
 -- in `CategoryTheory.Category.PartialFun`

c4658a64

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

@@ -57,7 +57,7 @@ theorem elim'_none (b : β) (f : α → β) : Option.elim' b f none = b := rfl
 @[simp]
 theorem elim'_some (b : β) (f : α → β) : Option.elim' b f (some a) = f a := rfl
 
--- porting note: this lemma was introduced because it is necessary
+-- Porting note: this lemma was introduced because it is necessary
 -- in `CategoryTheory.Category.PartialFun`
 lemma elim'_eq_elim {α β : Type*} (b : β) (f : α → β) (a : Option α) :
     Option.elim' b f a = Option.elim a b f := by

c4658a64

feat: add lake exe shake to CI (#9751)

depends on: #9830
depends on: #9772
depends on: #9996

This checks files for unused imports. The output here is piped through gh-problem-matcher-wrap so that it will show up as annotations.

Co-authored-by: Mario Carneiro <di.gama@gmail.com>

056cc4b2

Diff

@@ -3,7 +3,8 @@ Copyright (c) 2018 Mario Carneiro. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Mario Carneiro
 -/
-import Mathlib.Init.Algebra.Classes
+import Mathlib.Mathport.Rename
+import Mathlib.Tactic.Lemma
 import Mathlib.Tactic.TypeStar
 
 #align_import data.option.defs from "leanprover-community/mathlib"@"c4658a649d216f57e99621708b09dcb3dcccbd23"

c4658a64

chore: move to v4.6.0-rc1, merging adaptations from bump/v4.6.0 (#10176)

Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Eric Wieser <wieser.eric@gmail.com> Co-authored-by: Joachim Breitner <mail@joachim-breitner.de>

490d2d48

Diff

@@ -103,29 +103,27 @@ theorem mem_toList {a : α} {o : Option α} : a ∈ toList o ↔ a ∈ o := by
   cases o <;> simp [toList, eq_comm]
 #align option.mem_to_list Option.mem_toList
 
-instance liftOrGet_isCommutative (f : α → α → α) [IsCommutative α f] :
-    IsCommutative (Option α) (liftOrGet f) :=
-  ⟨fun a b ↦ by cases a <;> cases b <;> simp [liftOrGet, IsCommutative.comm]⟩
+instance liftOrGet_isCommutative (f : α → α → α) [Std.Commutative f] :
+    Std.Commutative (liftOrGet f) :=
+  ⟨fun a b ↦ by cases a <;> cases b <;> simp [liftOrGet, Std.Commutative.comm]⟩
 
-instance liftOrGet_isAssociative (f : α → α → α) [IsAssociative α f] :
-    IsAssociative (Option α) (liftOrGet f) :=
-  ⟨fun a b c ↦ by cases a <;> cases b <;> cases c <;> simp [liftOrGet, IsAssociative.assoc]⟩
+instance liftOrGet_isAssociative (f : α → α → α) [Std.Associative f] :
+    Std.Associative (liftOrGet f) :=
+  ⟨fun a b c ↦ by cases a <;> cases b <;> cases c <;> simp [liftOrGet, Std.Associative.assoc]⟩
 
-instance liftOrGet_isIdempotent (f : α → α → α) [IsIdempotent α f] :
-    IsIdempotent (Option α) (liftOrGet f) :=
-  ⟨fun a ↦ by cases a <;> simp [liftOrGet, IsIdempotent.idempotent]⟩
+instance liftOrGet_isIdempotent (f : α → α → α) [Std.IdempotentOp f] :
+    Std.IdempotentOp (liftOrGet f) :=
+  ⟨fun a ↦ by cases a <;> simp [liftOrGet, Std.IdempotentOp.idempotent]⟩
 
-instance liftOrGet_isLeftId (f : α → α → α) : IsLeftId (Option α) (liftOrGet f) none :=
-  ⟨fun a ↦ by cases a <;> simp [liftOrGet]⟩
-
-instance liftOrGet_isRightId (f : α → α → α) : IsRightId (Option α) (liftOrGet f) none :=
-  ⟨fun a ↦ by cases a <;> simp [liftOrGet]⟩
+instance liftOrGet_isId (f : α → α → α) : Std.LawfulIdentity (liftOrGet f) none where
+  left_id a := by cases a <;> simp [liftOrGet]
+  right_id a := by cases a <;> simp [liftOrGet]
 
 #align option.lift_or_get_comm Option.liftOrGet_isCommutative
 #align option.lift_or_get_assoc Option.liftOrGet_isAssociative
 #align option.lift_or_get_idem Option.liftOrGet_isIdempotent
-#align option.lift_or_get_is_left_id Option.liftOrGet_isLeftId
-#align option.lift_or_get_is_right_id Option.liftOrGet_isRightId
+#align option.lift_or_get_is_left_id Option.liftOrGet_isId
+#align option.lift_or_get_is_right_id Option.liftOrGet_isId
 
 /-- Convert `undef` to `none` to make an `LOption` into an `Option`. -/
 def _root_.Lean.LOption.toOption {α} : Lean.LOption α → Option α

c4658a64

chore(*): reduce dependencies on Mathlib.Tactic.* (#9816)

Drop import Mathlib.Tactic.Basic in Mathlib.Init.Logic and Mathlib.Logic.Basic.
Fix compile, sometimes golf broken proofs instead of re-adding imports.

8c01465a

Diff

@@ -4,6 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Mario Carneiro
 -/
 import Mathlib.Init.Algebra.Classes
+import Mathlib.Tactic.TypeStar
 
 #align_import data.option.defs from "leanprover-community/mathlib"@"c4658a649d216f57e99621708b09dcb3dcccbd23"

c4658a64

fix(Data/Option/Defs): Remove Option.rel and Option.maybe, superceded by std4 (#9178)

Remove Option.rel and Option.maybe, which have identical definitions to Option.Rel and Option.sequence, and aren't used anywhere.

da34c254

Diff

@@ -21,15 +21,6 @@ namespace Option
 
 #align option.lift_or_get Option.liftOrGet
 
-/-- Lifts a relation `α → β → Prop` to a relation `Option α → Option β → Prop` by just adding
-`none ~ none`. -/
-inductive rel (r : α → β → Prop) : Option α → Option β → Prop
-  | /-- If `a ~ b`, then `some a ~ some b` -/
-    some {a b} : r a b → rel r (some a) (some b)
-  | /-- `none ~ none` -/
-    none : rel r none none
-#align option.rel Option.rel
-
 /-- Traverse an object of `Option α` with a function `f : α → F β` for an applicative `F`. -/
 protected def traverse.{u, v}
     {F : Type u → Type v} [Applicative F] {α : Type*} {β : Type u} (f : α → F β) :
@@ -38,13 +29,7 @@ protected def traverse.{u, v}
   | some x => some <$> f x
 #align option.traverse Option.traverse
 
-/-- If you maybe have a monadic computation in a `[Monad m]` which produces a term of type `α`,
-then there is a naturally associated way to always perform a computation in `m` which maybe
-produces a result. -/
-def maybe.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α) → m (Option α)
-  | none => pure none
-  | some fn => some <$> fn
-#align option.maybe Option.maybe
+#align option.maybe Option.sequence
 
 #align option.mmap Option.mapM
 #align option.melim Option.elimM

c4658a64

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

@@ -31,7 +31,8 @@ inductive rel (r : α → β → Prop) : Option α → Option β → Prop
 #align option.rel Option.rel
 
 /-- Traverse an object of `Option α` with a function `f : α → F β` for an applicative `F`. -/
-protected def traverse.{u, v} {F : Type u → Type v} [Applicative F] {α β : Type _} (f : α → F β) :
+protected def traverse.{u, v}
+    {F : Type u → Type v} [Applicative F] {α : Type*} {β : Type u} (f : α → F β) :
     Option α → F (Option β)
   | none => pure none
   | some x => some <$> f x

c4658a64

chore: further cleanup of norm_num (#7046)

The main change here is to split NormNum.Core into NormNum.Result and NormNum.Core. Other than that split it is just moving small declarations to better homes.

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

f48d0465

Diff

@@ -139,3 +139,8 @@ instance liftOrGet_isRightId (f : α → α → α) : IsRightId (Option α) (lif
 #align option.lift_or_get_idem Option.liftOrGet_isIdempotent
 #align option.lift_or_get_is_left_id Option.liftOrGet_isLeftId
 #align option.lift_or_get_is_right_id Option.liftOrGet_isRightId
+
+/-- Convert `undef` to `none` to make an `LOption` into an `Option`. -/
+def _root_.Lean.LOption.toOption {α} : Lean.LOption α → Option α
+  | .some a => some a
+  | _ => none

c4658a64

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 @@ files under `Mathlib.Data.Option`.
 Other basic operations on `Option` are defined in the core library.
 -/
 
+set_option autoImplicit true
+
 namespace Option
 
 #align option.lift_or_get Option.liftOrGet

c4658a64

chore: banish Type _ and Sort _ (#6499)

We remove all possible occurences of Type _ and Sort _ in favor of Type* and Sort*.

This has nice performance benefits.

32de3f67

Diff

@@ -51,7 +51,7 @@ protected def getDM' [Monad m] (x : m (Option α)) (y : m α) : m α := do
   (← x).getDM y
 #align option.mget_or_else Option.getDM'
 
-variable {α : Type _} {β : Type _}
+variable {α : Type*} {β : Type*}
 
 -- Porting note: Would need to add the attribute directly in `Init.Prelude`.
 -- attribute [inline] Option.isSome Option.isNone
@@ -69,12 +69,12 @@ theorem elim'_some (b : β) (f : α → β) : Option.elim' b f (some a) = f a :=
 
 -- porting note: this lemma was introduced because it is necessary
 -- in `CategoryTheory.Category.PartialFun`
-lemma elim'_eq_elim {α β : Type _} (b : β) (f : α → β) (a : Option α) :
+lemma elim'_eq_elim {α β : Type*} (b : β) (f : α → β) (a : Option α) :
     Option.elim' b f a = Option.elim a b f := by
   cases a <;> rfl
 
 
-theorem mem_some_iff {α : Type _} {a b : α} : a ∈ some b ↔ b = a := by simp
+theorem mem_some_iff {α : Type*} {a b : α} : a ∈ some b ↔ b = a := by simp
 #align option.mem_some_iff Option.mem_some_iff
 
 /-- `o = none` is decidable even if the wrapped type does not have decidable equality.

c4658a64

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.option.defs
-! leanprover-community/mathlib commit c4658a649d216f57e99621708b09dcb3dcccbd23
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.Init.Algebra.Classes
 
+#align_import data.option.defs from "leanprover-community/mathlib"@"c4658a649d216f57e99621708b09dcb3dcccbd23"
+
 /-!
 # Extra definitions on `Option`

c4658a64

feat: port CategoryTheory.Category.PartialFun (#5301)

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

05a29ead

Diff

@@ -70,6 +70,13 @@ theorem elim'_none (b : β) (f : α → β) : Option.elim' b f none = b := rfl
 @[simp]
 theorem elim'_some (b : β) (f : α → β) : Option.elim' b f (some a) = f a := rfl
 
+-- porting note: this lemma was introduced because it is necessary
+-- in `CategoryTheory.Category.PartialFun`
+lemma elim'_eq_elim {α β : Type _} (b : β) (f : α → β) (a : Option α) :
+    Option.elim' b f a = Option.elim a b f := by
+  cases a <;> rfl
+
+
 theorem mem_some_iff {α : Type _} {a b : α} : a ∈ some b ↔ b = a := by simp
 #align option.mem_some_iff Option.mem_some_iff

c4658a64

chore: formatting issues (#4947)

Co-authored-by: Scott Morrison <scott.morrison@anu.edu.au> Co-authored-by: Parcly Taxel <reddeloostw@gmail.com>

5068808d

Diff

@@ -25,25 +25,25 @@ namespace Option
 /-- Lifts a relation `α → β → Prop` to a relation `Option α → Option β → Prop` by just adding
 `none ~ none`. -/
 inductive rel (r : α → β → Prop) : Option α → Option β → Prop
-| /-- If `a ~ b`, then `some a ~ some b` -/
-  some {a b} : r a b → rel r (some a) (some b)
-| /-- `none ~ none` -/
-  none : rel r none none
+  | /-- If `a ~ b`, then `some a ~ some b` -/
+    some {a b} : r a b → rel r (some a) (some b)
+  | /-- `none ~ none` -/
+    none : rel r none none
 #align option.rel Option.rel
 
 /-- Traverse an object of `Option α` with a function `f : α → F β` for an applicative `F`. -/
 protected def traverse.{u, v} {F : Type u → Type v} [Applicative F] {α β : Type _} (f : α → F β) :
-  Option α → F (Option β)
-| none => pure none
-| some x => some <$> f x
+    Option α → F (Option β)
+  | none => pure none
+  | some x => some <$> f x
 #align option.traverse Option.traverse
 
 /-- If you maybe have a monadic computation in a `[Monad m]` which produces a term of type `α`,
 then there is a naturally associated way to always perform a computation in `m` which maybe
 produces a result. -/
 def maybe.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α) → m (Option α)
-| none => pure none
-| some fn => some <$> fn
+  | none => pure none
+  | some fn => some <$> fn
 #align option.maybe Option.maybe
 
 #align option.mmap Option.mapM

c4658a64

chore: restore simp tag for BoxIntegral.BoxAdditiveMap.map_split_add (#4294)

9b45a6f8

Diff

@@ -60,12 +60,16 @@ variable {α : Type _} {β : Type _}
 -- attribute [inline] Option.isSome Option.isNone
 
 /-- An elimination principle for `Option`. It is a nondependent version of `Option.rec`. -/
-@[simp]
 protected def elim' (b : β) (f : α → β) : Option α → β
   | some a => f a
   | none => b
 #align option.elim Option.elim'
 
+@[simp]
+theorem elim'_none (b : β) (f : α → β) : Option.elim' b f none = b := rfl
+@[simp]
+theorem elim'_some (b : β) (f : α → β) : Option.elim' b f (some a) = f a := rfl
+
 theorem mem_some_iff {α : Type _} {a b : α} : a ∈ some b ↔ b = a := by simp
 #align option.mem_some_iff Option.mem_some_iff

c4658a64

chore: fix #align lines (#3640)

This PR fixes two things:

Most align statements for definitions and theorems and instances that are separated by two newlines from the relevant declaration (s/\n\n#align/\n#align). This is often seen in the mathport output after ending calc blocks.
All remaining more-than-one-line #align statements. (This was needed for a script I wrote for #3630.)

2b42dc7c

Diff

@@ -64,7 +64,6 @@ variable {α : Type _} {β : Type _}
 protected def elim' (b : β) (f : α → β) : Option α → β
   | some a => f a
   | none => b
-
 #align option.elim Option.elim'
 
 theorem mem_some_iff {α : Type _} {a b : α} : a ∈ some b ↔ b = a := by simp
@@ -105,7 +104,6 @@ theorem iget_some [Inhabited α] {a : α} : (some a).iget = a :=
 @[simp]
 theorem mem_toList {a : α} {o : Option α} : a ∈ toList o ↔ a ∈ o := by
   cases o <;> simp [toList, eq_comm]
-
 #align option.mem_to_list Option.mem_toList
 
 instance liftOrGet_isCommutative (f : α → α → α) [IsCommutative α f] :

c4658a64

chore: bump lean, std4, quote4, aesop (#2709)

ac9bdd4d

Diff

@@ -48,7 +48,11 @@ def maybe.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α)
 
 #align option.mmap Option.mapM
 #align option.melim Option.elimM
-#align option.mget_or_else Option.getDM
+
+@[deprecated getDM]
+protected def getDM' [Monad m] (x : m (Option α)) (y : m α) : m α := do
+  (← x).getDM y
+#align option.mget_or_else Option.getDM'
 
 variable {α : Type _} {β : Type _}

c4658a64

chore: add missing #align statements (#1902)

This PR is the result of a slight variant on the following "algorithm"

take all mathlib 3 names, remove _ and make all uppercase letters into lowercase
take all mathlib 4 names, remove _ and make all uppercase letters into lowercase
look for matches, and create pairs (original_lean3_name, OriginalLean4Name)
for pairs that do not have an align statement:
- use Lean 4 to lookup the file + position of the Lean 4 name
- add an #align statement just before the next empty line
manually fix some tiny mistakes (e.g., empty lines in proofs might cause the #align statement to have been inserted too early)

b72bb858

Diff

@@ -29,12 +29,14 @@ inductive rel (r : α → β → Prop) : Option α → Option β → Prop
   some {a b} : r a b → rel r (some a) (some b)
 | /-- `none ~ none` -/
   none : rel r none none
+#align option.rel Option.rel
 
 /-- Traverse an object of `Option α` with a function `f : α → F β` for an applicative `F`. -/
 protected def traverse.{u, v} {F : Type u → Type v} [Applicative F] {α β : Type _} (f : α → F β) :
   Option α → F (Option β)
 | none => pure none
 | some x => some <$> f x
+#align option.traverse Option.traverse
 
 /-- If you maybe have a monadic computation in a `[Monad m]` which produces a term of type `α`,
 then there is a naturally associated way to always perform a computation in `m` which maybe
@@ -42,6 +44,7 @@ produces a result. -/
 def maybe.{u, v} {m : Type u → Type v} [Monad m] {α : Type u} : Option (m α) → m (Option α)
 | none => pure none
 | some fn => some <$> fn
+#align option.maybe Option.maybe
 
 #align option.mmap Option.mapM
 #align option.melim Option.elimM
@@ -61,6 +64,7 @@ protected def elim' (b : β) (f : α → β) : Option α → β
 #align option.elim Option.elim'
 
 theorem mem_some_iff {α : Type _} {a b : α} : a ∈ some b ↔ b = a := by simp
+#align option.mem_some_iff Option.mem_some_iff
 
 /-- `o = none` is decidable even if the wrapped type does not have decidable equality.
 This is not an instance because it is not definitionally equal to `Option.decidableEq`.
@@ -69,6 +73,7 @@ Try to use `o.isNone` or `o.isSome` instead.
 @[inline]
 def decidableEqNone {o : Option α} : Decidable (o = none) :=
   decidable_of_decidable_of_iff isNone_iff_eq_none
+#align option.decidable_eq_none Option.decidableEqNone
 
 instance decidableForallMem {p : α → Prop} [DecidablePred p] :
     ∀ o : Option α, Decidable (∀ a ∈ o, p a)
@@ -87,9 +92,11 @@ instance decidableExistsMem {p : α → Prop} [DecidablePred p] :
 def iget [Inhabited α] : Option α → α
   | some x => x
   | none => default
+#align option.iget Option.iget
 
 theorem iget_some [Inhabited α] {a : α} : (some a).iget = a :=
   rfl
+#align option.iget_some Option.iget_some
 
 @[simp]
 theorem mem_toList {a : α} {o : Option α} : a ∈ toList o ↔ a ∈ o := by

c4658a64

chore: fix more casing errors per naming scheme (#1232)

I've avoided anything under Tactic or test.

In correcting the names, I found Option.isNone_iff_eq_none duplicated between Std and Mathlib, so the Mathlib one has been removed.

Co-authored-by: Reid Barton <rwbarton@gmail.com>

31a56f75

Diff

@@ -60,9 +60,6 @@ protected def elim' (b : β) (f : α → β) : Option α → β
 
 #align option.elim Option.elim'
 
-theorem is_none_iff_eq_none {o : Option α} : o.isNone = true ↔ o = none :=
-  ⟨Option.eq_none_of_isNone, fun e ↦ e.symm ▸ rfl⟩
-
 theorem mem_some_iff {α : Type _} {a b : α} : a ∈ some b ↔ b = a := by simp
 
 /-- `o = none` is decidable even if the wrapped type does not have decidable equality.
@@ -71,7 +68,7 @@ Try to use `o.isNone` or `o.isSome` instead.
 -/
 @[inline]
 def decidableEqNone {o : Option α} : Decidable (o = none) :=
-  decidable_of_decidable_of_iff is_none_iff_eq_none
+  decidable_of_decidable_of_iff isNone_iff_eq_none
 
 instance decidableForallMem {p : α → Prop} [DecidablePred p] :
     ∀ o : Option α, Decidable (∀ a ∈ o, p a)

c4658a64

chore: fix casing per naming scheme (#1183)

Fix a lot of wrong casing mostly in the docstrings but also sometimes in def/theorem names. E.g. fin 2 --> Fin 2, add_monoid_hom --> AddMonoidHom

Remove \n from to_additive docstrings that were inserted by mathport.

Move files and directories with Gcd and Smul to GCD and SMul

71723d8b

Diff

@@ -52,7 +52,7 @@ variable {α : Type _} {β : Type _}
 -- Porting note: Would need to add the attribute directly in `Init.Prelude`.
 -- attribute [inline] Option.isSome Option.isNone
 
-/-- An elimination principle for `Option`. It is a nondependent version of `option.rec`. -/
+/-- An elimination principle for `Option`. It is a nondependent version of `Option.rec`. -/
 @[simp]
 protected def elim' (b : β) (f : α → β) : Option α → β
   | some a => f a
@@ -66,7 +66,7 @@ theorem is_none_iff_eq_none {o : Option α} : o.isNone = true ↔ o = none :=
 theorem mem_some_iff {α : Type _} {a b : α} : a ∈ some b ↔ b = a := by simp
 
 /-- `o = none` is decidable even if the wrapped type does not have decidable equality.
-This is not an instance because it is not definitionally equal to `option.decidable_eq`.
+This is not an instance because it is not definitionally equal to `Option.decidableEq`.
 Try to use `o.isNone` or `o.isSome` instead.
 -/
 @[inline]

c4658a64

chore: add source headers to ported theory files (#1094)

The script used to do this is included. The yaml file was obtained from https://raw.githubusercontent.com/wiki/leanprover-community/mathlib/mathlib4-port-status.md

f168625e

Diff

@@ -2,6 +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.option.defs
+! leanprover-community/mathlib commit c4658a649d216f57e99621708b09dcb3dcccbd23
+! Please do not edit these lines, except to modify the commit id
+! if you have ported upstream changes.
 -/
 import Mathlib.Init.Algebra.Classes

`data.option.defs` ⟷ `Mathlib.Data.Option.Defs`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies

data.option.defs ⟷ Mathlib.Data.Option.Defs

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies

`data.option.defs` ⟷ `Mathlib.Data.Option.Defs`