Skip to content

[Merged by Bors] - chore: backports of adaptations for leanprover/lean4#6024#18896

Closed
kim-em wants to merge 11 commits intomasterfrom
backports_6024
Closed

[Merged by Bors] - chore: backports of adaptations for leanprover/lean4#6024#18896
kim-em wants to merge 11 commits intomasterfrom
backports_6024

Conversation

@kim-em
Copy link
Copy Markdown
Contributor

@kim-em kim-em commented Nov 12, 2024

leanprover/lean4#6024 fixes a serious elaboration bug which, perversely, was quite helpful.

Kyle is investigating replacing the bug with something intentional, but we definitively need to fix the bug in the meantime.

This is the backport of changes from lean-pr-testing-6024 which do not have conflicts with master. There are a few more changes that we'll need to handle separately later.

@github-actions github-actions bot added the large-import Automatically added label for PRs with a significant increase in transitive imports label Nov 12, 2024
@github-actions
Copy link
Copy Markdown

github-actions bot commented Nov 12, 2024

PR summary ea2e06bd54

Import changes for modified files

No significant changes to the import graph

Import changes for all files
Files Import difference

Declarations diff

No declarations were harmed in the making of this PR! 🐙

You can run this locally as follows
## summary with just the declaration names:
./scripts/declarations_diff.sh <optional_commit>

## more verbose report:
./scripts/declarations_diff.sh long <optional_commit>

The doc-module for script/declarations_diff.sh contains some details about this script.

@github-actions github-actions bot removed the large-import Automatically added label for PRs with a significant increase in transitive imports label Nov 12, 2024
Copy link
Copy Markdown
Member

@kbuzzard kbuzzard left a comment

Choose a reason for hiding this comment

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

This is all fine. Re the new adaptation notes: I don't really understand enough about why they are there to comment, but I was surprised that they just all mentioned a date 11-11-2024 rather than the Lean issue leanprover/lean4#6024 which was the cause of the adaptation.

I also note that the Lean PR is not yet merged. I'm just flagging this because I don't really understand the workflow.

@kbuzzard
Copy link
Copy Markdown
Member

bors d+

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Nov 12, 2024

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

@github-actions github-actions bot added the delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). label Nov 12, 2024
@kmill
Copy link
Copy Markdown
Contributor

kmill commented Nov 12, 2024

Good point @kbuzzard, I'll adjust the adaptation notes.

Regarding the workflow, with this PR we're just trying to modify Mathlib to avoid making use of an existing bug. It's not necessary to do this, but it's a way we can make the adaptation PRs less massive down the line. It can also make fixing nightly-testing easier once lean4#6024 is merged.

@kmill
Copy link
Copy Markdown
Contributor

kmill commented Nov 12, 2024

bors r+

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Nov 12, 2024
mathlib-bors bot pushed a commit that referenced this pull request Nov 12, 2024
leanprover/lean4#6024 fixes a serious elaboration bug which, perversely, was quite helpful.

Kyle is investigating replacing the bug with something intentional, but we definitively need to fix the bug in the meantime.

This is the backport of changes from lean-pr-testing-6024 which do not have conflicts with `master`. There are a few more changes that we'll need to handle separately later.

Co-authored-by: Kyle Miller <kmill31415@gmail.com>
@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Nov 12, 2024

Pull request successfully merged into master.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title chore: backports of adaptations for leanprover/lean4#6024 [Merged by Bors] - chore: backports of adaptations for leanprover/lean4#6024 Nov 12, 2024
@mathlib-bors mathlib-bors bot closed this Nov 12, 2024
@mathlib-bors mathlib-bors bot deleted the backports_6024 branch November 12, 2024 21:37
TobiasLeichtfried pushed a commit that referenced this pull request Nov 21, 2024
leanprover/lean4#6024 fixes a serious elaboration bug which, perversely, was quite helpful.

Kyle is investigating replacing the bug with something intentional, but we definitively need to fix the bug in the meantime.

This is the backport of changes from lean-pr-testing-6024 which do not have conflicts with `master`. There are a few more changes that we'll need to handle separately later.

Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants