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

[Merged by Bors] - feat: port SetTheory.ZFC.Basic #3165

Closed
wants to merge 31 commits into from
Closed

Conversation

vihdzp
Copy link
Collaborator

@vihdzp vihdzp commented Mar 29, 2023

A re-do of #1215, necessary since a lot of major changes have happened in the last months.


Open in Gitpod

@vihdzp vihdzp added WIP Work in progress mathlib-port This is a port of a theory file from mathlib. labels Mar 29, 2023
@Parcly-Taxel Parcly-Taxel changed the title feat: port SetTheory.Zfc.Basic (again) feat: port SetTheory.ZFC.Basic Mar 29, 2023

@[simp]
theorem unionₛ_pair {x y : ZFSet.{u}} : ⋃₀ ({x, y} : ZFSet.{u}) = x ∪ y :=
rfl
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The Mathlib 3 proof isn't rfl but could be, I'll fix that at a later time.

@vihdzp vihdzp added awaiting-review The author would like community review of the PR and removed WIP Work in progress labels Mar 30, 2023
@vihdzp
Copy link
Collaborator Author

vihdzp commented Mar 30, 2023

The file has been ported up to SHA 98bbc3526516bca903bff09ea10c4206bf079e6b. I would like for this to be ported before I port any further Mathlib 3 changes.

@semorrison semorrison added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 5, 2023
@semorrison semorrison removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 5, 2023
@semorrison
Copy link
Contributor

bors merge

@github-actions github-actions bot added ready-to-merge This PR has been sent to bors. and removed awaiting-review The author would like community review of the PR labels Apr 6, 2023
bors bot pushed a commit that referenced this pull request Apr 6, 2023
A re-do of #1215, necessary since a lot of major changes have happened in the last months.



Co-authored-by: Jeremy Tan Jie Rui <reddeloostw@gmail.com>
@bors
Copy link

bors bot commented Apr 6, 2023

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title feat: port SetTheory.ZFC.Basic [Merged by Bors] - feat: port SetTheory.ZFC.Basic Apr 6, 2023
@bors bors bot closed this Apr 6, 2023
@bors bors bot deleted the zfc_port branch April 6, 2023 22:58
MonadMaverick pushed a commit that referenced this pull request Apr 9, 2023
A re-do of #1215, necessary since a lot of major changes have happened in the last months.



Co-authored-by: Jeremy Tan Jie Rui <reddeloostw@gmail.com>
MonadMaverick pushed a commit to MonadMaverick/mathlib4 that referenced this pull request Apr 9, 2023
A re-do of leanprover-community#1215, necessary since a lot of major changes have happened in the last months.



Co-authored-by: Jeremy Tan Jie Rui <reddeloostw@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mathlib-port This is a port of a theory file from mathlib. ready-to-merge This PR has been sent to bors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants