Skip to content

Conversation

@kim-em
Copy link

@kim-em kim-em commented Nov 3, 2025

No description provided.

* switch to modulized quote4

* increment rootHashGeneration

* include .ir files

* try minimizing failure

* minimize more

* use adjusted cache

* less minimal

* unminimize all

* restore

---------

Co-authored-by: Kim Morrison <kim@tqft.net>
@kbuzzard
Copy link
Member

kbuzzard commented Nov 3, 2025

Hmm, there seems to be a mess here. Lots of conflicts, and furthermore the changes in the first file in the github diff Archive/Imo/Imo1988Q6.lean for this PR are identical to the changes to that file in the already-merged #102 . (now resolved)

Due to a change in `grind` between `nightly-2025-10-31` and `nightly-2025-11-02`,
this proof is no longer working. I've temporarily commented it out to get a build of
`nightly-testing`.
-/
Copy link
Member

Choose a reason for hiding this comment

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

My understanding was that we now have a working proof again. Do we fix this now or tomorrow?

Copy link
Author

Choose a reason for hiding this comment

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

I think it's best tomorrow. The working proof wasn't into nightly-testing in time for the nightly-testing-2025-11-02 tag. We could choose to abandon this PR and roll everything into tomorrow, if it's too painful to flip back and forth.

theorem asString_nil : [].asString = "" :=
rfl

theorem toList_empty : "".toList = [] :=
Copy link
Member

Choose a reason for hiding this comment

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

Should the deleted theorems toList_inj and toList_empty be deprecated?

Copy link
Author

Choose a reason for hiding this comment

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

These were upstreamed, not deleted. We don't really have good tooling to explain this automatically at present, beyond pasting them back in and seeing X has already been declared.

Copy link
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.

Right at the bottom of the files diff there's a new file lean4checker in the root directoy, and I was not able to leave a github comment on it saying "was this file added intentionally?" for some reason.

@kim-em
Copy link
Author

kim-em commented Nov 3, 2025

Right at the bottom of the files diff there's a new file lean4checker in the root directoy, and I was not able to leave a github comment on it saying "was this file added intentionally?" for some reason.

fixed, that was my mistake

@kbuzzard
Copy link
Member

kbuzzard commented Nov 3, 2025

Modulo the comments this looks ready to merge

@kim-em
Copy link
Author

kim-em commented Nov 3, 2025

bors merge

mathlib-bors bot pushed a commit that referenced this pull request Nov 3, 2025
Co-authored-by: leanprover-community-mathlib4-bot <leanprover-community-mathlib4-bot@users.noreply.github.com>
Co-authored-by: Markus Himmel <markus@lean-fro.org>
Co-authored-by: github-actions <github-actions@github.com>
@mathlib-bors
Copy link

mathlib-bors bot commented Nov 3, 2025

Pull request successfully merged into bump/v4.26.0.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title chore: adaptations for nightly-2025-11-02 [Merged by Bors] - chore: adaptations for nightly-2025-11-02 Nov 3, 2025
@mathlib-bors mathlib-bors bot closed this Nov 3, 2025
@mathlib-bors mathlib-bors bot deleted the bump/nightly-2025-11-02 branch November 3, 2025 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants