Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - chore: bump toolchain to v4.3.0-rc1 #8051

Closed
wants to merge 12 commits into from

Conversation

semorrison
Copy link
Contributor

@semorrison semorrison commented Oct 31, 2023

This incorporates changes from

They can all be closed when this is merged.


Once the std PR is merged, we need to change the lakefile.lean here to point back to main. ✅

Open in Gitpod

@semorrison semorrison added awaiting-review The author would like community review of the PR awaiting-CI labels Oct 31, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added blocked-by-other-PR This PR depends on another PR which is still in the queue. and removed blocked-by-other-PR This PR depends on another PR which is still in the queue. labels Oct 31, 2023
@leanprover-community-mathlib4-bot
Copy link
Collaborator

@eric-wieser
Copy link
Member

!bench

lakefile.lean Outdated Show resolved Hide resolved
@@ -155,7 +155,8 @@ theorem cutMap_add (a b : α) : cutMap β (a + b) = cutMap β a + cutMap β b :=
rw [coe_mem_cutMap_iff]
exact_mod_cast sub_lt_comm.mp hq₁q
· rintro _ ⟨_, _, ⟨qa, ha, rfl⟩, ⟨qb, hb, rfl⟩, rfl⟩
refine' ⟨qa + qb, _, by norm_cast⟩
-- After leanprover/lean4#2734, `norm_cast` needs help with beta reduction.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a possibly regression to me (and the only one in this patch); can you explain what's going on in the PR description, and maybe open a tracking issue for fixing this to be referenced there too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tracking issue at #8052.

(Also, since you read these diffs I've changed these regressions to use beta_reduce or unfold_let specifically, instead of a blind dsimp.)

@leanprover-bot
Copy link
Collaborator

Here are the benchmark results for commit ec994a6.
The entire run failed.
Found no significant differences.

@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Oct 31, 2023
@semorrison semorrison removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Oct 31, 2023
@semorrison
Copy link
Contributor Author

!bench

@leanprover-bot
Copy link
Collaborator

Here are the benchmark results for commit eb549bf.
There were significant changes against commit 7531592:

  Benchmark                                             Metric         Change
  ===========================================================================
- ~Mathlib.Algebra.Module.LocalizedModule               instructions     2.8%
+ ~Mathlib.CategoryTheory.Abelian.InjectiveResolution   instructions    -1.5%
+ ~Mathlib.CategoryTheory.Abelian.Projective            instructions    -2.3%
- ~Mathlib.CategoryTheory.Functor.Flat                  instructions   182.6%
- ~Mathlib.CategoryTheory.Monoidal.Mon_                 instructions     3.8%
- ~Mathlib.FieldTheory.RatFunc                          instructions     2.5%
- ~Mathlib.LinearAlgebra.FinsuppVectorSpace             instructions     3.0%
+ ~Mathlib.NumberTheory.NumberField.Units               instructions    -3.1%

@eric-wieser
Copy link
Member

Ouch, what happened to Mathlib.CategoryTheory.Functor.Flat?

@@ -481,7 +481,7 @@ lemma IsSelfAdjoint.coe_realPart {x : A} (hx : IsSelfAdjoint x) :

lemma IsSelfAdjoint.imaginaryPart {x : A} (hx : IsSelfAdjoint x) :
ℑ x = 0 := by
rw [imaginaryPart, LinearMap.comp_apply, hx.skewAdjointPart_apply _, map_zero]
rw [_root_.imaginaryPart, LinearMap.comp_apply, hx.skewAdjointPart_apply _, map_zero]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't the same thing as was in #7872... I'll push a fix.

Copy link
Member

@eric-wieser eric-wieser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors merge

Thanks!

@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the ready-to-merge This PR has been sent to bors. label Oct 31, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the awaiting-review The author would like community review of the PR label Oct 31, 2023
@eric-wieser
Copy link
Member

bors p=10

@eric-wieser
Copy link
Member

bors single on

bors bot pushed a commit that referenced this pull request Oct 31, 2023
This incorporates changes from 

* #7845
* #7847
* #7853
* #7872 (was never actually made to work, but the diffs in `nightly-testing` are unexciting: we need to fully qualify a few names)

They can all be closed when this is merged.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
@bors
Copy link

bors bot commented Oct 31, 2023

Pull request successfully merged into master.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot changed the title chore: bump toolchain to v4.3.0-rc1 [Merged by Bors] - chore: bump toolchain to v4.3.0-rc1 Oct 31, 2023
@bors bors bot closed this Oct 31, 2023
@bors bors bot deleted the bump_v4.3.0-rc1 branch October 31, 2023 10:54
bors bot pushed a commit that referenced this pull request Oct 31, 2023
This file recently jumped almost 200% in #8051. Changing a `simpa using X` call into a `convert X <;> simp` cuts the clock time for the file in half.
bors bot pushed a commit that referenced this pull request Oct 31, 2023
This file recently jumped almost 200% in #8051. Changing a `simpa using X` call into a `convert X <;> simp` cuts the clock time for the file in half.
fgdorais pushed a commit that referenced this pull request Nov 1, 2023
This incorporates changes from 

* #7845
* #7847
* #7853
* #7872 (was never actually made to work, but the diffs in `nightly-testing` are unexciting: we need to fully qualify a few names)

They can all be closed when this is merged.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
fgdorais pushed a commit that referenced this pull request Nov 1, 2023
This file recently jumped almost 200% in #8051. Changing a `simpa using X` call into a `convert X <;> simp` cuts the clock time for the file in half.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has been sent to bors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants