Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove simp from Option.elim, replace with individal simp lemmas #4504

Merged
merged 2 commits into from
Jun 23, 2024

Conversation

BoltonBailey
Copy link
Contributor

@BoltonBailey BoltonBailey commented Jun 19, 2024

This PR removes the simp attribute from Option.elim and adds it to two related simp lemmas, Option.elim_none and Option.elim_some.

This PR comes from some discussion here about simps! feeling too aggressive in unfolding this lemma.

@BoltonBailey BoltonBailey changed the title add changes chore: Remove simp from Option.elim, replace with individal simp lemmas Jun 19, 2024
@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 Jun 19, 2024
@leanprover-community-mathlib4-bot
Copy link
Collaborator

leanprover-community-mathlib4-bot commented Jun 19, 2024

Mathlib CI status (docs):

  • ❗ Batteries/Mathlib CI will not be attempted unless your PR branches off the nightly-with-mathlib branch. Try git rebase 0a1a855ba80e51515570439f3d73d3d9414ac053 --onto 1cf71e54cf268e87cf5c43c830d953f5c88e6c39. (2024-06-19 21:29:43)
  • ❗ Batteries/Mathlib CI will not be attempted unless your PR branches off the nightly-with-mathlib branch. Try git rebase bc047b8530f76f75c4456192b3ca24ad28c85420 --onto 1cf71e54cf268e87cf5c43c830d953f5c88e6c39. (2024-06-19 21:51:47)
  • ❗ Batteries/Mathlib CI will not be attempted unless your PR branches off the nightly-with-mathlib branch. Try git rebase 84e46162b5d25581039cd575c40bc6bd347f0853 --onto 357b52928f905bfb85a3496e411cf12fa20e730c. (2024-06-21 15:09:43)
  • 💥 Mathlib branch lean-pr-testing-4504 build failed against this PR. (2024-06-21 17:40:27) View Log
  • 💥 Mathlib branch lean-pr-testing-4504 build failed against this PR. (2024-06-21 18:07:16) View Log
  • 💥 Mathlib branch lean-pr-testing-4504 build failed against this PR. (2024-06-21 18:42:01) View Log
  • ✅ Mathlib branch lean-pr-testing-4504 has successfully built against this PR. (2024-06-21 19:44:02) View Log

@BoltonBailey
Copy link
Contributor Author

BoltonBailey commented Jun 19, 2024

This rebase command from the bot does not seem to affect the PR in any way. I am not really sure what to do to be able to see if and how this breaks mathlib.

@leodemoura
Copy link
Member

@BoltonBailey Have tried to squash your commits before executing the command? Another option is to use

git reset --hard origin/nightly-with-mathlib
git cherry-pick 1c29870c1aa
git cherry-pick 4554124b873

@BoltonBailey
Copy link
Contributor Author

origin, which in this case is my fork of this repo, does not have a nightly-with-mathlib branch, so I don't think that will work. I could try the "squash"ing option, but it seems like it would require me to learn something called "interactive rebasing".

@semorrison
Copy link
Collaborator

origin, which in this case is my fork of this repo, does not have a nightly-with-mathlib branch, so I don't think that will work. I could try the "squash"ing option, but it seems like it would require me to learn something called "interactive rebasing".

Replace origin with the name of the upstream referring to this repository?

leanprover-community-mathlib4-bot added a commit to leanprover-community/batteries that referenced this pull request Jun 21, 2024
leanprover-community-mathlib4-bot added a commit to leanprover-community/mathlib4 that referenced this pull request Jun 21, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added breaks-mathlib This is not necessarily a blocker for merging: but there needs to be a plan release-ci Enable all CI checks for a PR, like is done for releases labels Jun 21, 2024
leanprover-community-mathlib4-bot added a commit to leanprover-community/batteries that referenced this pull request Jun 21, 2024
leanprover-community-mathlib4-bot added a commit to leanprover-community/mathlib4 that referenced this pull request Jun 21, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added 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 Jun 21, 2024
@semorrison semorrison added this pull request to the merge queue Jun 23, 2024
Merged via the queue into leanprover:master with commit 5426a5c Jun 23, 2024
29 checks passed
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 release-ci Enable all CI checks for a PR, like is done for releases 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.

None yet

4 participants