[Merged by Bors] - feat: port changes to Cardinal files
#3343
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vihdzp
added
blocked-by-other-PR
bors bot
pushed a commit
to leanprover-community/mathlib3
that referenced
this pull request
Apr 9, 2023
…18771) Some of the new results on limit cardinals were awkwardly breaking up blocks of code with related theorems, probably due to some botched merge. We reorder them to avoid this. Ported along other changes to this file in: leanprover-community/mathlib4#3343
|
bors merge |
|
👎 Rejected by label |
github-actions
bot
added
ready-to-merge
Parcly-Taxel
removed
the
blocked-by-other-PR
Parcly-Taxel
removed
the
blocked-by-other-PR
semorrison
added
blocked-by-other-PR
|
bors p=5 |
|
bors merge |
|
Merge conflict. |
semorrison
removed
the
blocked-by-other-PR
|
This PR/issue depends on: |
eric-wieser
added
the
mathlib3-pair
…into cardinal_is_limit
bors bot
pushed a commit
that referenced
this pull request
Apr 9, 2023
My bad for letting these pile up. * [`set_theory.cardinal.basic`@`4c19a16e4b705bf135cf9a80ac18fcc99c438514`..`e05ead7993520a432bec94ac504842d90707ad63`](https://leanprover-community.github.io/mathlib-port-status/file/set_theory/cardinal/basic?range=4c19a16e4b705bf135cf9a80ac18fcc99c438514..e05ead7993520a432bec94ac504842d90707ad63) * [`set_theory.cardinal.continuum`@`3d7987cda72abc473c7cdbbb075170e9ac620042`..`e08a42b2dd544cf11eba72e5fc7bf199d4349925`](https://leanprover-community.github.io/mathlib-port-status/file/set_theory/cardinal/continuum?range=3d7987cda72abc473c7cdbbb075170e9ac620042..e08a42b2dd544cf11eba72e5fc7bf199d4349925) * [`set_theory.cardinal.cofinality`@`bb168510ef455e9280a152e7f31673cabd3d7496`..`7c2ce0c2da15516b4e65d0c9e254bb6dc93abd1f`](https://leanprover-community.github.io/mathlib-port-status/file/set_theory/cardinal/cofinality?range=bb168510ef455e9280a152e7f31673cabd3d7496..7c2ce0c2da15516b4e65d0c9e254bb6dc93abd1f) * [`set_theory.cardinal.ordinal`@`8da9e30545433fdd8fe55a0d3da208e5d9263f03`..`7c2ce0c2da15516b4e65d0c9e254bb6dc93abd1f`](https://leanprover-community.github.io/mathlib-port-status/file/set_theory/cardinal/ordinal?range=8da9e30545433fdd8fe55a0d3da208e5d9263f03..7c2ce0c2da15516b4e65d0c9e254bb6dc93abd1f) * [`set_theory.ordinal.arithmetic`@`b67044ba53af18680e1dd246861d9584e968495d`..`e08a42b2dd544cf11eba72e5fc7bf199d4349925`](https://leanprover-community.github.io/mathlib-port-status/file/set_theory/ordinal/arithmetic?range=b67044ba53af18680e1dd246861d9584e968495d..e08a42b2dd544cf11eba72e5fc7bf199d4349925) Co-authored-by: Scott Morrison <scott@tqft.net> Co-authored-by: Scott Morrison <scott.morrison@gmail.com> Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
|
Pull request successfully merged into master. Build succeeded: |
bors
bot
changed the title
Cardinal filesCardinal files
bors bot
pushed a commit
that referenced
this pull request
Apr 10, 2023
* `algebra.group.ulift`: this is a change that was already backported in leanprover-community/mathlib3#18268 to match mathlib4, only the SHA needs to be updated. * `set_theory.cardinal.basic`: the changes from leanprover-community/mathlib3#18771 were already forward-ported in #3343, but the sha was not updated. Here I've also inlined all `by`s and generally tidied up the formatting. * `order.rel_iso.basic` (leanprover-community/mathlib3#18699, leanprover-community/mathlib3#18758) is now fully forward-ported too. Co-authored-by: Parcly Taxel <reddeloostw@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
My bad for letting these pile up.
set_theory.cardinal.basic@4c19a16e4b705bf135cf9a80ac18fcc99c438514..e05ead7993520a432bec94ac504842d90707ad63set_theory.cardinal.continuum@3d7987cda72abc473c7cdbbb075170e9ac620042..e08a42b2dd544cf11eba72e5fc7bf199d4349925set_theory.cardinal.cofinality@bb168510ef455e9280a152e7f31673cabd3d7496..7c2ce0c2da15516b4e65d0c9e254bb6dc93abd1fset_theory.cardinal.ordinal@8da9e30545433fdd8fe55a0d3da208e5d9263f03..7c2ce0c2da15516b4e65d0c9e254bb6dc93abd1fset_theory.ordinal.arithmetic@b67044ba53af18680e1dd246861d9584e968495d..e08a42b2dd544cf11eba72e5fc7bf199d4349925