Skip to content

chore: remove membership instance on Option from most theorem statements#7856

Merged
TwoFX merged 2 commits intomasterfrom
markus/option-membership-cleanup
Apr 8, 2025
Merged

chore: remove membership instance on Option from most theorem statements#7856
TwoFX merged 2 commits intomasterfrom
markus/option-membership-cleanup

Conversation

@TwoFX
Copy link
Copy Markdown
Member

@TwoFX TwoFX commented Apr 7, 2025

This PR changes definitions and theorems not to use the membership instance on Option unless the theorem is specifically about the membership instance.

The reasoning for this change is that the lemma a ∈ o ↔ o = some a is a simp lemma, and we generally want theorem statements to use simp normal forms.

One notable exception is the ForIn' instance, which must use Membership because unlike GetElem, ForIn' requires the validity predicate to be expressed via Membership.

@TwoFX TwoFX changed the title Markus/option membership cleanup chore: remove membership instance on Option from most theorem statements Apr 7, 2025
@TwoFX TwoFX added the changelog-library Library label Apr 7, 2025
@github-actions github-actions bot temporarily deployed to lean-lang.org/lean4/doc April 7, 2025 12:20 Inactive
@github-actions github-actions bot added the toolchain-available A toolchain is available for this PR, at leanprover/lean4-pr-releases:pr-release-NNNN label Apr 7, 2025
@ghost
Copy link
Copy Markdown

ghost commented Apr 7, 2025

Mathlib CI status (docs):

  • ❗ Batteries/Mathlib CI will not be attempted unless your PR branches off the nightly-with-mathlib branch. Try git rebase b0acdef43354de641ccbb275b185fdc4ae1d197b --onto da55b2e19b6af219f43f3599f1a72151799eb524. You can force Mathlib CI using the force-mathlib-ci label. (2025-04-07 12:31:03)
  • 💥 Mathlib branch lean-pr-testing-7856 build failed against this PR. (2025-04-08 07:40:39) View Log
  • ✅ Mathlib branch lean-pr-testing-7856 has successfully built against this PR. (2025-04-08 07:57:57) View Log

@TwoFX TwoFX force-pushed the markus/option-membership-cleanup branch from 464857b to c50c46f Compare April 8, 2025 06:32
@github-actions github-actions bot temporarily deployed to lean-lang.org/lean4/doc April 8, 2025 06:39 Inactive
ghost pushed a commit to leanprover-community/batteries that referenced this pull request Apr 8, 2025
ghost pushed a commit to leanprover-community/mathlib4 that referenced this pull request Apr 8, 2025
@ghost ghost added breaks-mathlib This is not necessarily a blocker for merging: but there needs to be a plan builds-mathlib CI has verified that Mathlib builds against this PR and removed breaks-mathlib This is not necessarily a blocker for merging: but there needs to be a plan labels Apr 8, 2025
@TwoFX TwoFX marked this pull request as ready for review April 8, 2025 08:06
@TwoFX TwoFX requested review from digama0 and kim-em as code owners April 8, 2025 08:06
@TwoFX TwoFX enabled auto-merge April 8, 2025 08:06
@TwoFX TwoFX added this pull request to the merge queue Apr 8, 2025
Merged via the queue into master with commit 106b772 Apr 8, 2025
28 checks passed
kmill added a commit to leanprover-community/mathlib4 that referenced this pull request Apr 19, 2025
* fixes

* fix test

* fix

* chore: adaptations for leanprover/lean4#7797

* stricter rfl check

* fix merge

* Trigger CI for leanprover/lean4#7797

* Trigger CI for leanprover/lean4#7797

* Trigger CI for leanprover/lean4#7797

* inverse construction

* Update lean-toolchain for testing leanprover/lean4#7791

* lake update

* Fix

* Fix

* Fix

* chore: bump to nightly-2025-04-03

* more fixes

* merge lean-pr-testing-6325

* bump proofwidgets

* Update lean-toolchain for testing leanprover/lean4#7812

* shake

* fix shake

* fix tests

* import mathlib.init

* Update lean-toolchain for testing leanprover/lean4#7816

* Trigger CI for leanprover/lean4#7816

* Update lean-toolchain for testing leanprover/lean4#7802

* Fix

* fixes

* Fix (pending upstream changes)

* Trigger CI for leanprover/lean4#7802

* fix

* chore: bump to nightly-2025-04-04

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Update lean-toolchain for testing leanprover/lean4#7818

* Fix

* Fix

* Fix

* Merge master into nightly-testing

* Fix

* Fix comments

* fixes

* Trigger CI for leanprover/lean4#7816

* fix

* fix

* missing doc-string?

* chore: bump to nightly-2025-04-05

* chore: bump to nightly-2025-04-06

* move Batteries to nightly-testing

* lake update

* lint

* fix

* chore: bump to nightly-2025-04-07

* sprinkle noncomputable

* fix: relativize file paths

fix for leanprover/lean4#7822

* chore: reset cache

* chore: bump to nightly-2025-04-07

* shake

* fix: relativize more

* Update lean-toolchain for testing leanprover/lean4#7856

* Update lean-toolchain for testing leanprover/lean4#7851

* Fix

* Fix

* Fix

* Fix

* chore: bump to nightly-2025-04-08

* Update lean-toolchain for testing leanprover/lean4#7870

* Trigger CI for leanprover/lean4#7870

* Trigger CI for leanprover/lean4#7870

* Trigger CI for leanprover/lean4#7870

* wip

* Trigger CI for leanprover/lean4#7870

* .

* chore: bump to nightly-2025-04-09

* Trigger CI for leanprover/lean4#7870

* .

* bump

* lake update

* fixes for leanprover/lean4#7873

* fixes

* deprecations

* chore: bump to nightly-2025-04-10

* chore: `Option.zipWith` -> `Option.merge`

* lake update

* toolchain

* fix

* fix

* Update lean-toolchain for testing leanprover/lean4#7897

* Trigger CI for leanprover/lean4#7897

* fix

* lake update and fix

* Fix

* Fix

* Trigger CI for leanprover/lean4#7897

* fix merge

* chore: adaptations for nightly-2025-04-10

* chore: bump to nightly-2025-04-14

* fix

* .

* annotate changed goal state

* fixes (adaptation notes)

* cleanup imports

* cleanup

* Update lean-toolchain for testing leanprover/lean4#7933

* Fix

* Fix

* Update lean-toolchain for testing leanprover/lean4#7975

* remove adaptation notes

* chore: bump to nightly-2025-04-16

---------

Co-authored-by: leanprover-community-mathlib4-bot <leanprover-community-mathlib4-bot@users.noreply.github.com>
Co-authored-by: Kim Morrison <kim@tqft.net>
Co-authored-by: Markus Himmel <markus@lean-fro.org>
Co-authored-by: Rob23oba <robin.arnez@web.de>
Co-authored-by: Mario Carneiro <di.gama@gmail.com>
Co-authored-by: Johan Commelin <johan@commelin.net>
Co-authored-by: github-actions <github-actions@github.com>
@TwoFX TwoFX deleted the markus/option-membership-cleanup branch August 4, 2025 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

builds-mathlib CI has verified that Mathlib builds against this PR changelog-library Library toolchain-available A toolchain is available for this PR, at leanprover/lean4-pr-releases:pr-release-NNNN

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant