Skip to content

[Merged by Bors] - chore: backports for leanprover/lean4#4814 (part 1)#15245

Closed
kim-em wants to merge 3 commits intomasterfrom
variables_backport_1
Closed

[Merged by Bors] - chore: backports for leanprover/lean4#4814 (part 1)#15245
kim-em wants to merge 3 commits intomasterfrom
variables_backport_1

Conversation

@kim-em
Copy link
Copy Markdown
Contributor

@kim-em kim-em commented Jul 29, 2024

The new variables inclusion mechanism leanprover/lean4#4814 is going to require many changes to Mathlib.

Some of these changes are to make sure typeclass hypotheses are not unnecessarily included. This is achieved either by using section to bound variable [...], using variable ... in, or reordering theorems. (I think you can see all three being using here.)

Other changes require adding include ... to include variables that the new mechanism won't automatically include. These changes can't be backported to master, and instead are accumulating on the lean-pr-testing-4814 branch.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Jul 29, 2024

PR summary 5092be0756

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.

Comment on lines +954 to +955
section
variable [Decidable Q]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This one looks wrong, you're just adding an assumption.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Previously we were using an explicit Decidable P, and the classical decidable instance for Q. Surely this is not what was intended?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the explanation, I had not noticed the attribute [local instance 10] Classical.propDecidable at the beginning of the file (which we should probably remove, but that's for another PR).

mathlib-bors bot pushed a commit that referenced this pull request Jul 29, 2024
mathlib-bors bot pushed a commit that referenced this pull request Jul 30, 2024
mathlib-bors bot pushed a commit that referenced this pull request Jul 30, 2024
mathlib-bors bot pushed a commit that referenced this pull request Jul 31, 2024
see #15245



Co-authored-by: Kim Morrison <kim@tqft.net>
mathlib-bors bot pushed a commit that referenced this pull request Jul 31, 2024
@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 Jul 31, 2024
@sgouezel
Copy link
Copy Markdown
Contributor

bors d+

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Jul 31, 2024

✌️ 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.

@github-actions github-actions bot added the delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). label Jul 31, 2024
mathlib-bors bot pushed a commit that referenced this pull request Jul 31, 2024
See #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
@kim-em kim-em removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Jul 31, 2024
@kim-em
Copy link
Copy Markdown
Contributor Author

kim-em commented Jul 31, 2024

bors merge

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Jul 31, 2024
mathlib-bors bot pushed a commit that referenced this pull request Aug 1, 2024
The new variables inclusion mechanism leanprover/lean4#4814 is going to require many changes to Mathlib.

Some of these changes are to make sure typeclass hypotheses are not unnecessarily included. This is achieved either by using `section` to bound `variable [...]`, using `variable ... in`, or reordering theorems. (I think you can see all three being using here.)

Other changes require adding `include ...` to include variables that the new mechanism won't automatically include. These changes can't be backported to master, and instead are accumulating on the `lean-pr-testing-4814` branch.
@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Aug 1, 2024

Pull request successfully merged into master.

Build succeeded:

bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
See #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
The new variables inclusion mechanism leanprover/lean4#4814 is going to require many changes to Mathlib.

Some of these changes are to make sure typeclass hypotheses are not unnecessarily included. This is achieved either by using `section` to bound `variable [...]`, using `variable ... in`, or reordering theorems. (I think you can see all three being using here.)

Other changes require adding `include ...` to include variables that the new mechanism won't automatically include. These changes can't be backported to master, and instead are accumulating on the `lean-pr-testing-4814` branch.
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 9, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 12, 2024
See #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 12, 2024
The new variables inclusion mechanism leanprover/lean4#4814 is going to require many changes to Mathlib.

Some of these changes are to make sure typeclass hypotheses are not unnecessarily included. This is achieved either by using `section` to bound `variable [...]`, using `variable ... in`, or reordering theorems. (I think you can see all three being using here.)

Other changes require adding `include ...` to include variables that the new mechanism won't automatically include. These changes can't be backported to master, and instead are accumulating on the `lean-pr-testing-4814` branch.
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 12, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 12, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
bjoernkjoshanssen pushed a commit that referenced this pull request Sep 12, 2024
see #15245

Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.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.

2 participants