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.

Sign up for GitHub

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

Jump to bottom

[Merged by Bors] - feat(set_theory/ordinal_arithmetic, set_theory/cardinal_ordinal): deriv and aleph are enumerators #10987

Closed
wants to merge 103 commits into from
Closed

[Merged by Bors] - feat(set_theory/ordinal_arithmetic, set_theory/cardinal_ordinal): deriv and aleph are enumerators #10987

wants to merge 103 commits into from

Conversation

vihdzp
Copy link
Collaborator

@vihdzp vihdzp commented Dec 23, 2021 •
edited by github-actions bot

@vihdzp vihdzp added awaiting-review The author would like community review of the PR blocked-by-other-PR This PR depends on another PR which is still in the queue. A bot manages this label via PR comment. awaiting-CI The author would like to see what CI has to say before doing more work. labels Dec 23, 2021
@github-actions github-actions bot removed the awaiting-CI The author would like to see what CI has to say before doing more work. label Dec 23, 2021
@vihdzp vihdzp changed the title feat(ordinal/ordinal_arithmetic, ordinal/cardinal_ordinal): deriv and aleph are enumerators feat(set_theory/ordinal_arithmetic, set_theory/cardinal_ordinal): deriv and aleph are enumerators Dec 23, 2021
@vihdzp vihdzp mentioned this pull request Dec 23, 2021
Closed
5 tasks
@vihdzp vihdzp added WIP Work in progress and removed awaiting-review The author would like community review of the PR labels Dec 25, 2021
@github-actions github-actions bot added the merge-conflict Please `git merge origin/master` then a bot will remove this label. label Dec 25, 2021
@leanprover-community-bot-assistant leanprover-community-bot-assistant removed the blocked-by-other-PR This PR depends on another PR which is still in the queue. A bot manages this label via PR comment. label Jan 21, 2022
@leanprover-community leanprover-community deleted a comment from github-actions bot Jan 21, 2022
@leanprover-community-bot-assistant
Copy link
Collaborator

This PR/issue depends on:

@leanprover-community-bot-assistant leanprover-community-bot-assistant added the merge-conflict Please `git merge origin/master` then a bot will remove this label. label Jan 21, 2022
@leanprover-community-bot-assistant leanprover-community-bot-assistant removed the merge-conflict Please `git merge origin/master` then a bot will remove this label. label Jan 21, 2022
@vihdzp vihdzp added awaiting-review The author would like community review of the PR and removed WIP Work in progress labels Jan 21, 2022
@vihdzp
Copy link
Collaborator Author

vihdzp commented Jan 22, 2022

Once #11594 is merged, I can hopefully make the code not break anymore.

@vihdzp
Copy link
Collaborator Author

vihdzp commented Jan 27, 2022

The code no longer breaks.

b-mehta
b-mehta approved these changes Jan 31, 2022
View reviewed changes
Copy link
Collaborator

@b-mehta b-mehta left a comment

Choose a reason for hiding this comment

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

bors d+

src/set_theory/cardinal_ordinal.lean Outdated Show resolved Hide resolved
src/set_theory/cardinal_ordinal.lean Outdated Show resolved Hide resolved
@bors
Copy link

bors bot commented Jan 31, 2022

✌️ vihdzp can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@leanprover-community-bot-assistant leanprover-community-bot-assistant added delegated The PR author may merge after reviewing final suggestions. and removed awaiting-review The author would like community review of the PR labels Jan 31, 2022
@vihdzp
Copy link
Collaborator Author

vihdzp commented Jan 31, 2022

bors r+

bors bot pushed a commit that referenced this pull request Jan 31, 2022
@vihdzp
feat(set_theory/ordinal_arithmetic, set_theory/cardinal_ordinal): `de…
719b7b0 
…riv` and `aleph` are enumerators (#10987)

We prove `deriv_eq_enum_fp`, `ord_aleph'_eq_enum_card`, and `ord_aleph_eq_enum_card`.
@bors
Copy link

bors bot commented Jan 31, 2022

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title feat(set_theory/ordinal_arithmetic, set_theory/cardinal_ordinal): deriv and aleph are enumerators [Merged by Bors] - feat(set_theory/ordinal_arithmetic, set_theory/cardinal_ordinal): deriv and aleph are enumerators Jan 31, 2022
@bors bors bot closed this Jan 31, 2022
@bors bors bot deleted the deriv_fp_enum branch January 31, 2022 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@digama0 digama0 digama0 left review comments

@b-mehta b-mehta b-mehta approved these changes

Assignees
No one assigned
Labels
delegated The PR author may merge after reviewing final suggestions.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@vihdzp @leanprover-community-bot-assistant @digama0 @b-mehta