chore: adaptations for nightly-2024-04-07 #11997
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
semorrison
added
the
awaiting-review
leanprover-community-mathlib4-bot
added
the
merge-conflict
leanprover-community-mathlib4-bot
removed
the
merge-conflict
semorrison
commented
Apr 16, 2024
semorrison
commented
Apr 16, 2024
| @@ -60,20 +60,6 @@ theorem not_false' : ¬false := nofun | |||
| theorem eq_iff_eq_true_iff {a b : Bool} : a = b ↔ ((a = true) ↔ (b = true)) := by | |||
| cases a <;> cases b <;> simp | |||
|
|
|||
| -- Porting note (#10756): new theorem | |||
There was a problem hiding this comment.
These have been upstreamed.
semorrison
commented
Apr 16, 2024
Mathlib/Data/Fin/Basic.lean
Outdated
| @@ -1609,7 +1609,6 @@ theorem le_sub_one_iff {n : ℕ} {k : Fin (n + 1)} : k ≤ k - 1 ↔ k = 0 := by | |||
| simp | |||
| #align fin.le_sub_one_iff Fin.le_sub_one_iff | |||
|
|
|||
| @[simp] | |||
There was a problem hiding this comment.
Already merged to master as #11967
semorrison
commented
Apr 16, 2024
semorrison
commented
Apr 16, 2024
semorrison
commented
Apr 16, 2024
semorrison
commented
Apr 16, 2024
| @@ -356,7 +356,7 @@ lemma map_comp {i j k : Fin (n + 1 + 1)} (hij : i ≤ j) (hjk : j ≤ k) : | |||
| · dsimp | |||
| rw [id_comp] | |||
| · obtain _ | _ | k := k | |||
| · simp at hjk | |||
| · simp [Nat.succ.injEq] at hjk | |||
There was a problem hiding this comment.
Something equivalent to this was removed from the default simp set because it was going haywire on numerals.
semorrison
added a commit
that referenced
this pull request
Apr 16, 2024
…nity/mathlib4 into bump/nightly-2024-04-07
semorrison
force-pushed
the
bump/nightly-2024-04-07
branch
from
2013e81
to
da393b3
Compare
Ruben-VandeVelde
approved these changes
Apr 18, 2024
There was a problem hiding this comment.
The majority of the remaining changes seem to be:
- slowdowns / simpNF timeputs with notes
- [Merged by Bors] - fix: improve proofs in QuadraticModuleCat.Monoidal #12233
- rfl-after-conv
- A few remaining
Ne.def/id.defchanges - updates for Std bump
Everything else seems an improvement or relatively inoffensive, so I think we should let #12233 merge, cherry-pick it to bump/v4.8.0 and then merge this.
jcommelin
reviewed
Apr 18, 2024
Comment on lines
+5
to
+9
| -- Adaptation note: at nightly-2024-03-27, | ||
| -- we had to increase `maxHeartbeats` here from 8000 to 16000. | ||
| -- Adaptation note: at nightly-2024-04-01, | ||
| -- we had to increase `maxHeartbeats` here from 16000 to 24000. | ||
| -- (Note: successive runs are faster, because of the `exact?` cache initialisation.) |
There was a problem hiding this comment.
Hmmm, I'm a bit sad about these. Do we have ideas about how to get the number down again?
There was a problem hiding this comment.
Unfortunately not yet. :-(
Co-authored-by: Johan Commelin <johan@commelin.net>
|
I've looked through the entire diff. Looks fine to me. bors d+ |
|
✌️ semorrison can now approve this pull request. To approve and merge a pull request, simply reply with |
github-actions
bot
added
delegated
and removed
awaiting-review
|
bors merge |
|
bors r- |
|
Canceled. |
uniwuni
pushed a commit
that referenced
this pull request
Apr 19, 2024
) These are changes from #11997, the latest adaptation PR for nightly-2024-04-07, which can be made directly on master. Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
callesonne
pushed a commit
that referenced
this pull request
Apr 22, 2024
) These are changes from #11997, the latest adaptation PR for nightly-2024-04-07, which can be made directly on master. Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
Jun2M
pushed a commit
that referenced
this pull request
Apr 24, 2024
) These are changes from #11997, the latest adaptation PR for nightly-2024-04-07, which can be made directly on master. Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the PR to
bump/v4.8.0, bringing us up fromnightly-2024-03-24tonightly-2024-04-07(so almost two weeks).Note that the release of v4.8.0-rc1 has been delayed because of remaining issues:
This PR contains a number of
set_option maxHeartbeats ...or@[nolint simpNF]which are required by heartbeats errors.These are due to changes to
IsDefEqfrom leanprover/lean4#3807.So far, the ones I've looked in detail have revealed some problems where we are probably abusing defeq a bit, so I would appreciate any available eyes on these to see which ones ought to be fixed in Mathlib, and which ones are problematic.
It's been a long road to keep
nightly-testingalive, and some big refactors have been landing onmaster, and I'm sure there are mistakes in how I've merged things here, so please be gentle if I've messed things up (and in particular feel free to revert changes that look like mistakes, as long as you test them!). :-)