Merge pull request #469 from Seasawher/auto-update-branch

Lean/Mathlib update

Author: Seasawher

docs/attributes.md

@@ -1,6 +1,6 @@
 # Attributes
 
-Mathlib version: `3b5ca69666326212946f476ff8fd2cbc4796fb91`
+Mathlib version: `10061bf49d6d842b2099878901410ef3b6a393c2`
 
 ## Std.Internal.tree_tac
  simp theorems used by internal DTreeMap lemmas
@@ -1052,7 +1052,7 @@ default simp lemmas:
 ```lean
 -MonoidalCategory.whiskerLeft_id, -MonoidalCategory.id_whiskerRight,
 -MonoidalCategory.tensor_comp, -MonoidalCategory.tensor_comp_assoc,
--Mon_Class.mul_assoc, -Mon_Class.mul_assoc_assoc
+-MonObj.mul_assoc, -MonObj.mul_assoc_assoc
 ```
 
 The general algorithm it follows is to push the associators `α_` and commutators `β_` inwards until

docs/commands.md

@@ -1,6 +1,6 @@
 # Commands
 
-Mathlib version: `3b5ca69666326212946f476ff8fd2cbc4796fb91`
+Mathlib version: `10061bf49d6d842b2099878901410ef3b6a393c2`
 
 ## \#adaptation_note
 Defined in: `adaptationNoteCmd`

docs/options.md

@@ -1,6 +1,6 @@
 # Options
 
-Mathlib version: `3b5ca69666326212946f476ff8fd2cbc4796fb91`
+Mathlib version: `10061bf49d6d842b2099878901410ef3b6a393c2`
 
 ## Elab.async
 type: `Bool`
@@ -947,6 +947,13 @@ default: `true`
 
 enable the tactic analysis framework
 
+## linter.tacticAnalysis.introMerge
+type: `Bool`
+
+default: `true`
+
+
+
 ## linter.tacticAnalysis.linarithToGrind
 type: `Bool`
 

docs/tactics.md

@@ -1,6 +1,6 @@
 # Tactics
 
-Mathlib version: `3b5ca69666326212946f476ff8fd2cbc4796fb91`
+Mathlib version: `10061bf49d6d842b2099878901410ef3b6a393c2`
 
 ## \#adaptation_note
 Defined in: `«tactic#adaptation_note_»`
@@ -3816,7 +3816,7 @@ optional arguments:
   (`true` by default.)
 * `restrict_type` (not yet implemented in mathlib4)
   will only use hypotheses that are inequalities over `tp`. This is useful
-  if you have e.g. both integer and rational valued inequalities in the local context, which can
+  if you have e.g. both integer- and rational-valued inequalities in the local context, which can
   sometimes confuse the tactic.
 
 A variant, `nlinarith`, does some basic preprocessing to handle some nonlinear goals.
@@ -3876,7 +3876,7 @@ optional arguments:
   (`true` by default.)
 * `restrict_type` (not yet implemented in mathlib4)
   will only use hypotheses that are inequalities over `tp`. This is useful
-  if you have e.g. both integer and rational valued inequalities in the local context, which can
+  if you have e.g. both integer- and rational-valued inequalities in the local context, which can
   sometimes confuse the tactic.
 
 A variant, `nlinarith`, does some basic preprocessing to handle some nonlinear goals.

lake-manifest.json

@@ -5,7 +5,7 @@
    "type": "git",
    "subDir": null,
    "scope": "",
-   "rev": "3b5ca69666326212946f476ff8fd2cbc4796fb91",
+   "rev": "10061bf49d6d842b2099878901410ef3b6a393c2",
    "name": "mathlib",
    "manifestFile": "lake-manifest.json",
    "inputRev": "master",