Skip to content

chore: adaptations to leanprover/lean4#3210#10133

Closed
kim-em wants to merge 2064 commits intobump/v4.6.0from
lean-pr-testing-3210
Closed

chore: adaptations to leanprover/lean4#3210#10133
kim-em wants to merge 2064 commits intobump/v4.6.0from
lean-pr-testing-3210

Conversation

@kim-em
Copy link
Copy Markdown
Contributor

@kim-em kim-em commented Jan 31, 2024

This PR contains WIP adaptations for leanprover/lean4#3210.

It is broken in three ways:

  • There are still changes needed in Mathlib.Tactic.NormNum.Core. I can look into those, but will also ping @digama0 just in case! :-)
  • There are many deep recursion errors generated by tactics which are calling into simp. (There's also one of these occurring in the aesop tests.) I'm not sure yet whether this is a problem with the adaptations, or a problem with the upstream PR.
  • There's an unsolved ¬1 % 2 = 0 goal in Mathlib/Init/Data/Nat/Bitwise.lean where simp is treating instances differently. I've minimised and Leo is looking into this.
  • There are two more unexpected simp failures, which Leo has MWEs for. These have resulted in a few temporary sorries in this PR so we can test everything else.
  • My fixes to push_neg are not correct, as the behaviour of push_neg has changed (producing \not x = y instead of x \ne y).

Open in Gitpod

kim-em and others added 30 commits January 10, 2024 22:59
…hlib4 into

nightly-testing # Please enter a commit message to explain why this merge is necessary, # especially
if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and
an empty message aborts # the commit.
(cherry picked from commit 68908a1)
@kim-em kim-em requested a review from digama0 January 31, 2024 01:41
@ghost ghost added blocked-by-other-PR This PR depends on another PR (this label is automatically managed by a bot) merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) labels Jan 31, 2024
@ghost ghost removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Jan 31, 2024
@ghost ghost removed the blocked-by-other-PR This PR depends on another PR (this label is automatically managed by a bot) label Feb 1, 2024
@ghost
Copy link
Copy Markdown

ghost commented Feb 1, 2024

kim-em added a commit that referenced this pull request Feb 2, 2024
This is the adaptation PR for nightly-2024-02-01.

It rolls in the branches
* #9843, prepared by @mattrobball, which has the adaptations for
leanprover/lean4#2478
* #10133, prepared by @semorrison, which has the adaptations for
leanprover/lean4#3210

As these both landed in the same nightly, we're having to do the update
in one go.

Note this nightly is intended to become `v4.6.0-rc1` tomorrow.

---
<!-- The text above the `---` will become the commit message when your
PR is merged. Please leave a blank newline before the `---`, otherwise
GitHub will format the text above it as a title.

To indicate co-authors, include lines at the bottom of the commit
message
(that is, before the `---`) using the following format:

Co-authored-by: Author Name <author@email.com>

Any other comments you want to keep out of the PR commit should go
below the `---`, and placed outside this HTML comment, or else they
will be invisible to reviewers.

If this PR depends on other PRs, please list them below this comment,
using the following format:
- [ ] depends on: #abc [optional extra text]
- [ ] depends on: #xyz [optional extra text]
-->

[![Open in
Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/)

---------

Co-authored-by: Kevin Buzzard <k.buzzard@imperial.ac.uk>
Co-authored-by: Matthew Ballard <matt@mrb.email>
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Feb 2, 2024
@kim-em
Copy link
Copy Markdown
Contributor Author

kim-em commented Feb 3, 2024

This was rolled into #10154

@kim-em kim-em closed this Apr 22, 2024
@YaelDillies YaelDillies deleted the lean-pr-testing-3210 branch August 12, 2025 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) WIP Work in progress

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants