control.monad.basic | Mathlib porting status

(last sync)

refactor(*): move all mk_simp_attribute commands to 1 file (#19223)

Diff

@@ -38,11 +38,7 @@ functor, applicative, monad, simp
 
 -/
 
-mk_simp_attribute monad_norm none with functor_norm
-
 attribute [ext] reader_t.ext state_t.ext except_t.ext option_t.ext
-attribute [functor_norm]   bind_assoc pure_bind bind_pure
-attribute [monad_norm] seq_eq_bind_map
 universes u v
 
 @[monad_norm]

(first ported)

Changes in mathlib3port

mathlib3

mathlib3port

bump to nightly-2023-09-24-06

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

5655435f

Diff

@@ -3,8 +3,8 @@ Copyright (c) 2019 Simon Hudon. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Simon Hudon
 -/
-import Mathbin.Logic.Equiv.Defs
-import Mathbin.Tactic.Basic
+import Logic.Equiv.Defs
+import Tactic.Basic
 
 #align_import control.monad.basic from "leanprover-community/mathlib"@"48fb5b5280e7c81672afc9524185ae994553ebf4"

bump to nightly-2023-07-20-09

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

9c56d0dd

Diff

@@ -2,15 +2,12 @@
 Copyright (c) 2019 Simon Hudon. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Simon Hudon
-
-! This file was ported from Lean 3 source module control.monad.basic
-! leanprover-community/mathlib commit 48fb5b5280e7c81672afc9524185ae994553ebf4
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathbin.Logic.Equiv.Defs
 import Mathbin.Tactic.Basic
 
+#align_import control.monad.basic from "leanprover-community/mathlib"@"48fb5b5280e7c81672afc9524185ae994553ebf4"
+
 /-!
 # Monad

bump to nightly-2023-07-04-01

mathlib commit https://github.com/leanprover-community/mathlib/commit/728ef9dbb281241906f25cbeb30f90d83e0bb451

05318d71

Diff

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Simon Hudon
 
 ! This file was ported from Lean 3 source module control.monad.basic
-! leanprover-community/mathlib commit 448144f7ae193a8990cb7473c9e9a01990f64ac7
+! leanprover-community/mathlib commit 48fb5b5280e7c81672afc9524185ae994553ebf4
 ! Please do not edit these lines, except to modify the commit id
 ! if you have ported upstream changes.
 -/
@@ -44,22 +44,8 @@ functor, applicative, monad, simp
 -/
 
 
-/- ./././Mathport/Syntax/Translate/Tactic/Mathlib/Core.lean:61:9: unsupported: weird string -/
--- PLEASE REPORT THIS TO MATHPORT DEVS, THIS SHOULD NOT HAPPEN.
--- failed to format: unknown constant 'Lean.Meta._root_.Lean.Parser.Command.registerSimpAttr'
-/-- ./././Mathport/Syntax/Translate/Tactic/Mathlib/Core.lean:61:9: unsupported: weird string -/
-  register_simp_attr
-  monad_norm
-
-/- [mathport] port note: move this to another file, it won't work here -/
-attribute [monad_norm] functor_norm
-
 attribute [ext] ReaderT.ext StateT.ext ExceptT.ext OptionT.ext
 
-attribute [functor_norm] bind_assoc pure_bind bind_pure
-
-attribute [monad_norm] seq_eq_bind_map
-
 universe u v
 
 #print map_eq_bind_pure_comp /-

bump to nightly-2023-06-13-21

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

829520ac

Diff

@@ -62,18 +62,23 @@ attribute [monad_norm] seq_eq_bind_map
 
 universe u v
 
+#print map_eq_bind_pure_comp /-
 @[monad_norm]
 theorem map_eq_bind_pure_comp (m : Type u → Type v) [Monad m] [LawfulMonad m] {α β : Type u}
     (f : α → β) (x : m α) : f <$> x = x >>= pure ∘ f := by rw [bind_pure_comp_eq_map]
 #align map_eq_bind_pure_comp map_eq_bind_pure_comp
+-/
 
+#print StateT.eval /-
 /-- run a `state_t` program and discard the final state -/
 def StateT.eval {m : Type u → Type v} [Functor m] {σ α} (cmd : StateT σ m α) (s : σ) : m α :=
   Prod.fst <$> cmd.run s
 #align state_t.eval StateT.eval
+-/
 
 universe u₀ u₁ v₀ v₁
 
+#print StateT.equiv /-
 /-- reduce the equivalence between two state monads to the equivalence between
 their respective function spaces -/
 def StateT.equiv {m₁ : Type u₀ → Type v₀} {m₂ : Type u₁ → Type v₁} {α₁ σ₁ : Type u₀}
@@ -85,7 +90,9 @@ def StateT.equiv {m₁ : Type u₀ → Type v₀} {m₂ : Type u₁ → Type v
   left_inv := fun ⟨f⟩ => congr_arg StateT.mk <| F.left_inv _
   right_inv := fun ⟨f⟩ => congr_arg StateT.mk <| F.right_inv _
 #align state_t.equiv StateT.equiv
+-/
 
+#print ReaderT.equiv /-
 /-- reduce the equivalence between two reader monads to the equivalence between
 their respective function spaces -/
 def ReaderT.equiv {m₁ : Type u₀ → Type v₀} {m₂ : Type u₁ → Type v₁} {α₁ ρ₁ : Type u₀}
@@ -96,4 +103,5 @@ def ReaderT.equiv {m₁ : Type u₀ → Type v₀} {m₂ : Type u₁ → Type v
   left_inv := fun ⟨f⟩ => congr_arg ReaderT.mk <| F.left_inv _
   right_inv := fun ⟨f⟩ => congr_arg ReaderT.mk <| F.right_inv _
 #align reader_t.equiv ReaderT.equiv
+-/

bump to nightly-2023-06-08-23

mathlib commit https://github.com/leanprover-community/mathlib/commit/31c24aa72e7b3e5ed97a8412470e904f82b81004

d3cfe2e3

Diff

@@ -45,13 +45,8 @@ functor, applicative, monad, simp
 
 
 /- ./././Mathport/Syntax/Translate/Tactic/Mathlib/Core.lean:61:9: unsupported: weird string -/
-/- failed to parenthesize: unknown constant 'Lean.Meta._root_.Lean.Parser.Command.registerSimpAttr'
-[PrettyPrinter.parenthesize.input] (Lean.Meta._root_.Lean.Parser.Command.registerSimpAttr
-     [(Command.docComment
-       "/--"
-       "./././Mathport/Syntax/Translate/Tactic/Mathlib/Core.lean:61:9: unsupported: weird string -/")]
-     "register_simp_attr"
-     `monad_norm)-/-- failed to format: unknown constant 'Lean.Meta._root_.Lean.Parser.Command.registerSimpAttr'
+-- PLEASE REPORT THIS TO MATHPORT DEVS, THIS SHOULD NOT HAPPEN.
+-- failed to format: unknown constant 'Lean.Meta._root_.Lean.Parser.Command.registerSimpAttr'
 /-- ./././Mathport/Syntax/Translate/Tactic/Mathlib/Core.lean:61:9: unsupported: weird string -/
   register_simp_attr
   monad_norm

bump to nightly-2023-05-28-06

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

ba5d8b97

Diff

@@ -67,23 +67,11 @@ attribute [monad_norm] seq_eq_bind_map
 
 universe u v
 
-/- warning: map_eq_bind_pure_comp -> map_eq_bind_pure_comp is a dubious translation:
-lean 3 declaration is
-  forall (m : Type.{u1} -> Type.{u2}) [_inst_1 : Monad.{u1, u2} m] [_inst_2 : LawfulMonad.{u1, u2} m _inst_1] {α : Type.{u1}} {β : Type.{u1}} (f : α -> β) (x : m α), Eq.{succ u2} (m β) (Functor.map.{u1, u2} (fun {α : Type.{u1}} => m α) (Applicative.toFunctor.{u1, u2} (fun {α : Type.{u1}} => m α) (Monad.toApplicative.{u1, u2} (fun {α : Type.{u1}} => m α) _inst_1)) α β f x) (Bind.bind.{u1, u2} m (Monad.toHasBind.{u1, u2} m _inst_1) α β x (Function.comp.{succ u1, succ u1, succ u2} α β (m β) (Pure.pure.{u1, u2} m (Applicative.toHasPure.{u1, u2} m (Monad.toApplicative.{u1, u2} m _inst_1)) β) f))
-but is expected to have type
-  forall {m : Type.{u1}} {_inst_1 : Type.{u1}} (_inst_2 : Type.{u1} -> Type.{u2}) [α : Monad.{u1, u2} _inst_2] [β : LawfulMonad.{u1, u2} _inst_2 α] (f : m -> _inst_1) (x : _inst_2 m), Eq.{succ u2} (_inst_2 _inst_1) (Functor.map.{u1, u2} _inst_2 (Applicative.toFunctor.{u1, u2} _inst_2 (Monad.toApplicative.{u1, u2} _inst_2 α)) m _inst_1 f x) (Bind.bind.{u1, u2} _inst_2 (Monad.toBind.{u1, u2} _inst_2 α) m _inst_1 x (Function.comp.{succ u1, succ u1, succ u2} m _inst_1 (_inst_2 _inst_1) (Pure.pure.{u1, u2} _inst_2 (Applicative.toPure.{u1, u2} _inst_2 (Monad.toApplicative.{u1, u2} _inst_2 α)) _inst_1) f))
-Case conversion may be inaccurate. Consider using '#align map_eq_bind_pure_comp map_eq_bind_pure_compₓ'. -/
 @[monad_norm]
 theorem map_eq_bind_pure_comp (m : Type u → Type v) [Monad m] [LawfulMonad m] {α β : Type u}
     (f : α → β) (x : m α) : f <$> x = x >>= pure ∘ f := by rw [bind_pure_comp_eq_map]
 #align map_eq_bind_pure_comp map_eq_bind_pure_comp
 
-/- warning: state_t.eval -> StateT.eval is a dubious translation:
-lean 3 declaration is
-  forall {m : Type.{u1} -> Type.{u2}} [_inst_1 : Functor.{u1, u2} m] {σ : Type.{u1}} {α : Type.{u1}}, (StateTₓ.{u1, u2} σ m α) -> σ -> (m α)
-but is expected to have type
-  forall {m : Type.{u1}} {_inst_1 : Type.{u1}} {σ : Type.{u1} -> Type.{u2}} [α : Functor.{u1, u2} σ], (StateT.{u1, u2} m σ _inst_1) -> m -> (σ _inst_1)
-Case conversion may be inaccurate. Consider using '#align state_t.eval StateT.evalₓ'. -/
 /-- run a `state_t` program and discard the final state -/
 def StateT.eval {m : Type u → Type v} [Functor m] {σ α} (cmd : StateT σ m α) (s : σ) : m α :=
   Prod.fst <$> cmd.run s
@@ -91,12 +79,6 @@ def StateT.eval {m : Type u → Type v} [Functor m] {σ α} (cmd : StateT σ m 
 
 universe u₀ u₁ v₀ v₁
 
-/- warning: state_t.equiv -> StateT.equiv is a dubious translation:
-lean 3 declaration is
-  forall {m₁ : Type.{u1} -> Type.{u3}} {m₂ : Type.{u2} -> Type.{u4}} {α₁ : Type.{u1}} {σ₁ : Type.{u1}} {α₂ : Type.{u2}} {σ₂ : Type.{u2}}, (Equiv.{max (succ u1) (succ u3), max (succ u2) (succ u4)} (σ₁ -> (m₁ (Prod.{u1, u1} α₁ σ₁))) (σ₂ -> (m₂ (Prod.{u2, u2} α₂ σ₂)))) -> (Equiv.{succ (max u1 u3), succ (max u2 u4)} (StateTₓ.{u1, u3} σ₁ m₁ α₁) (StateTₓ.{u2, u4} σ₂ m₂ α₂))
-but is expected to have type
-  forall {m₁ : Type.{u1}} {m₂ : Type.{u1}} {α₁ : Type.{u3}} {σ₁ : Type.{u3}} {α₂ : Type.{u1} -> Type.{u2}} {σ₂ : Type.{u3} -> Type.{u4}}, (Equiv.{max (succ u2) (succ u1), max (succ u4) (succ u3)} (m₁ -> (α₂ (Prod.{u1, u1} m₂ m₁))) (α₁ -> (σ₂ (Prod.{u3, u3} σ₁ α₁)))) -> (Equiv.{max (succ u2) (succ u1), max (succ u4) (succ u3)} (StateT.{u1, u2} m₁ α₂ m₂) (StateT.{u3, u4} α₁ σ₂ σ₁))
-Case conversion may be inaccurate. Consider using '#align state_t.equiv StateT.equivₓ'. -/
 /-- reduce the equivalence between two state monads to the equivalence between
 their respective function spaces -/
 def StateT.equiv {m₁ : Type u₀ → Type v₀} {m₂ : Type u₁ → Type v₁} {α₁ σ₁ : Type u₀}
@@ -109,12 +91,6 @@ def StateT.equiv {m₁ : Type u₀ → Type v₀} {m₂ : Type u₁ → Type v
   right_inv := fun ⟨f⟩ => congr_arg StateT.mk <| F.right_inv _
 #align state_t.equiv StateT.equiv
 
-/- warning: reader_t.equiv -> ReaderT.equiv is a dubious translation:
-lean 3 declaration is
-  forall {m₁ : Type.{u1} -> Type.{u3}} {m₂ : Type.{u2} -> Type.{u4}} {α₁ : Type.{u1}} {ρ₁ : Type.{u1}} {α₂ : Type.{u2}} {ρ₂ : Type.{u2}}, (Equiv.{max (succ u1) (succ u3), max (succ u2) (succ u4)} (ρ₁ -> (m₁ α₁)) (ρ₂ -> (m₂ α₂))) -> (Equiv.{succ (max u1 u3), succ (max u2 u4)} (ReaderTₓ.{u1, u3} ρ₁ m₁ α₁) (ReaderTₓ.{u2, u4} ρ₂ m₂ α₂))
-but is expected to have type
-  forall {m₁ : Type.{u1}} {m₂ : Type.{u1}} {α₁ : Type.{u3}} {ρ₁ : Type.{u3}} {α₂ : Type.{u1} -> Type.{u2}} {ρ₂ : Type.{u3} -> Type.{u4}}, (Equiv.{max (succ u2) (succ u1), max (succ u4) (succ u3)} (m₁ -> (α₂ m₂)) (α₁ -> (ρ₂ ρ₁))) -> (Equiv.{max (succ u2) (succ u1), max (succ u4) (succ u3)} (ReaderT.{u1, u2} m₁ α₂ m₂) (ReaderT.{u3, u4} α₁ ρ₂ ρ₁))
-Case conversion may be inaccurate. Consider using '#align reader_t.equiv ReaderT.equivₓ'. -/
 /-- reduce the equivalence between two reader monads to the equivalence between
 their respective function spaces -/
 def ReaderT.equiv {m₁ : Type u₀ → Type v₀} {m₂ : Type u₁ → Type v₁} {α₁ ρ₁ : Type u₀}

bump to nightly-2023-02-21-16

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

1107b979

Changes in mathlib4

mathlib3

mathlib4

fix: shake the import tree (#9749)

cherry-picked from #9347

Co-Authored-By: @digama0

1d3b4790

Diff

@@ -3,9 +3,7 @@ Copyright (c) 2019 Simon Hudon. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Simon Hudon
 -/
-import Mathlib.Init.Control.Lawful
 import Mathlib.Logic.Equiv.Defs
-import Mathlib.Tactic.Common
 
 #align_import control.monad.basic from "leanprover-community/mathlib"@"48fb5b5280e7c81672afc9524185ae994553ebf4"
 
@@ -40,7 +38,7 @@ functor, applicative, monad, simp
 
 set_option autoImplicit true
 
-attribute [ext] ReaderT.ext StateT.ext ExceptT.ext OptionT.ext
+attribute [ext] ReaderT.ext StateT.ext ExceptT.ext
 
 @[monad_norm]
 theorem map_eq_bind_pure_comp (m : Type u → Type v) [Monad m] [LawfulMonad m]

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

@@ -38,6 +38,8 @@ functor, applicative, monad, simp
 
 -/
 
+set_option autoImplicit true
+
 attribute [ext] ReaderT.ext StateT.ext ExceptT.ext OptionT.ext
 
 @[monad_norm]

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) 2019 Simon Hudon. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Simon Hudon
-
-! This file was ported from Lean 3 source module control.monad.basic
-! leanprover-community/mathlib commit 48fb5b5280e7c81672afc9524185ae994553ebf4
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.Init.Control.Lawful
 import Mathlib.Logic.Equiv.Defs
 import Mathlib.Tactic.Common
 
+#align_import control.monad.basic from "leanprover-community/mathlib"@"48fb5b5280e7c81672afc9524185ae994553ebf4"
+
 /-!
 # Monad

refactor: move all register_simp_attrs to 1 file (#5681)

There are slight differences between mathlib3 and mathlib4 (different set of attributes, different lemmas are in core/std), so I redid the same refactor instead of forward-porting changes.

mathlib3 PR: leanprover-community/mathlib#19223

ceaa4ecb

Diff

@@ -4,13 +4,12 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Simon Hudon
 
 ! This file was ported from Lean 3 source module control.monad.basic
-! leanprover-community/mathlib commit 70d50ecfd4900dd6d328da39ab7ebd516abe4025
+! leanprover-community/mathlib commit 48fb5b5280e7c81672afc9524185ae994553ebf4
 ! Please do not edit these lines, except to modify the commit id
 ! if you have ported upstream changes.
 -/
 import Mathlib.Init.Control.Lawful
 import Mathlib.Logic.Equiv.Defs
-import Mathlib.Control.SimpSet
 import Mathlib.Tactic.Common
 
 /-!
@@ -44,11 +43,6 @@ functor, applicative, monad, simp
 
 attribute [ext] ReaderT.ext StateT.ext ExceptT.ext OptionT.ext
 
-attribute [functor_norm] bind_assoc pure_bind bind_pure
-
-attribute [monad_norm] seq_eq_bind_map
-
-
 @[monad_norm]
 theorem map_eq_bind_pure_comp (m : Type u → Type v) [Monad m] [LawfulMonad m]
     (f : α → β) (x : m α) : f <$> x = x >>= pure ∘ f :=

chore: fix backtick in docs (#5077)

I wrote a script to find lines that contain an odd number of backticks

878d95c4

Diff

@@ -27,8 +27,8 @@ import Mathlib.Tactic.Common
 Set of rewrite rules and automation for monads in general and
 `ReaderT`, `StateT`, `ExceptT` and `OptionT` in particular.
 
-The rewrite rules for monads are carefully chosen so that `simp with
-functor_norm` will not introduce monadic vocabulary in a context where
+The rewrite rules for monads are carefully chosen so that `simp with functor_norm`
+will not introduce monadic vocabulary in a context where
 applicatives would do just fine but will handle monadic notation
 already present in an expression.

feat: port Init.Control.Lawful (#4999)

39293534

Diff

@@ -8,6 +8,7 @@ Authors: Simon Hudon
 ! Please do not edit these lines, except to modify the commit id
 ! if you have ported upstream changes.
 -/
+import Mathlib.Init.Control.Lawful
 import Mathlib.Logic.Equiv.Defs
 import Mathlib.Control.SimpSet
 import Mathlib.Tactic.Common
@@ -41,7 +42,7 @@ functor, applicative, monad, simp
 
 -/
 
-attribute [ext] ReaderT.ext StateT.ext ExceptT.ext Option.ext
+attribute [ext] ReaderT.ext StateT.ext ExceptT.ext OptionT.ext
 
 attribute [functor_norm] bind_assoc pure_bind bind_pure

feat: add Mathlib.Tactic.Common, and import (#4056)

This makes a mathlib4 version of mathlib3's tactic.basic, now called Mathlib.Tactic.Common, which imports all tactics which do not have significant theory requirements, and then is imported all across the base of the hierarchy.

This ensures that all common tactics are available nearly everywhere in the library, rather than having to be imported one-by-one as you need them.

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

a4eaf1c4

Diff

@@ -10,6 +10,7 @@ Authors: Simon Hudon
 -/
 import Mathlib.Logic.Equiv.Defs
 import Mathlib.Control.SimpSet
+import Mathlib.Tactic.Common
 
 /-!
 # Monad

Revert "feat: add Mathlib.Tactic.Common, and import"

This reverts commit 1ce2f69b.

7a81a20c

Diff

@@ -10,7 +10,6 @@ Authors: Simon Hudon
 -/
 import Mathlib.Logic.Equiv.Defs
 import Mathlib.Control.SimpSet
-import Mathlib.Tactic.Common
 
 /-!
 # Monad

feat: add Mathlib.Tactic.Common, and import

1ce2f69b

Diff

@@ -10,6 +10,7 @@ Authors: Simon Hudon
 -/
 import Mathlib.Logic.Equiv.Defs
 import Mathlib.Control.SimpSet
+import Mathlib.Tactic.Common
 
 /-!
 # Monad