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] - feat: adaptations for leanprover/lean4#2964 #9176

Closed
wants to merge 3 commits into from

Conversation

semorrison
Copy link
Contributor

@semorrison semorrison commented Dec 21, 2023

This is a PR to bump/v4.5.0, containing the adaptations required for @Vtec234's leanprover/lean4#2964.

These adaptations are using a pre-release version of ProofWidgets4 (v0.0.24-pre2). After v4.5.0-rc1 becomes available, a new version of ProofWidgets4 with a more strongly-typed component API will be released, and a PR will be proposed to adapt Mathlib to it.

This will bring bump/v4.5.0 up to nightly-2023-12-21, which will tomorrow become v4.5.0-rc1. Thus once this PR is delegated and merged, Mathlib should be ready to move to the next release.


Open in Gitpod

@semorrison semorrison added awaiting-review The author would like community review of the PR awaiting-CI labels Dec 21, 2023
@semorrison semorrison changed the base branch from master to bump/v4.5.0 December 21, 2023 11:06
@@ -52,7 +52,7 @@ theorem join_filter_isEmpty_eq_false [DecidablePred fun l : List α => l.isEmpty
| [] :: L => by
simp [join_filter_isEmpty_eq_false (L := L), isEmpty_iff_eq_nil]
| (a :: l) :: L => by
simp [join_filter_isEmpty_eq_false (L := L), isEmpty_cons]
simp [join_filter_isEmpty_eq_false (L := L)]
Copy link
Member

Choose a reason for hiding this comment

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

Is this some merge weirdness, or genuinely intended as part of this patch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure. This is what is currently on nightly-testing: it doesn't seem to be on @Vtec234's lean-pr-testing-2964 branch...

Given it's a good change I'm inclined to just sneak it in here?

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 d+

@mathlib-bors
Copy link

mathlib-bors bot commented Dec 21, 2023

✌️ semorrison can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added delegated and removed awaiting-review The author would like community review of the PR labels Dec 21, 2023
@semorrison
Copy link
Contributor Author

bors merge

@semorrison semorrison closed this Dec 21, 2023
@mathlib-bors
Copy link

mathlib-bors bot commented Dec 21, 2023

Already running a review

@semorrison
Copy link
Contributor Author

Oops.

@semorrison semorrison reopened this Dec 21, 2023
@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Dec 21, 2023
@semorrison
Copy link
Contributor Author

bors merge

mathlib-bors bot pushed a commit that referenced this pull request Dec 21, 2023
This is a PR to `bump/v4.5.0`, containing the adaptations required for @Vtec234's leanprover/lean4#2964.

This will bring `bump/v4.5.0` up to `nightly-2023-12-21`, which will tomorrow become `v4.5.0-rc1`. Thus once this PR is delegated and merged, Mathlib should be ready to move to the next release.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
@mathlib-bors
Copy link

mathlib-bors bot commented Dec 21, 2023

Pull request successfully merged into bump/v4.5.0.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title feat: adaptations for leanprover/lean4#2964 [Merged by Bors] - feat: adaptations for leanprover/lean4#2964 Dec 21, 2023
@mathlib-bors mathlib-bors bot closed this Dec 21, 2023
@mathlib-bors mathlib-bors bot deleted the bump_bump_2964 branch December 21, 2023 13:20
mathlib-bors bot pushed a commit that referenced this pull request Dec 22, 2023
…h. (#9188)

This PR:
* bumps to lean-toolchain to `v4.5.0-rc1`
* bumps the Std and Aesop dependencies to their versions using `v4.5.0-rc1`
* merge the already reviewed changes from the `bump/v4.5.0` branch
  * adaptations for leanprover/lean4#2923 in #9011
  * adaptations for leanprover/lean4#2973 in #9161
  * adaptations for leanprover/lean4#2964 in #9176

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
delegated 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