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] - chore: Split Data.{Nat,Int}{.Order}.Basic in group vs ring instances #11924

Closed
wants to merge 13 commits into from

Conversation

YaelDillies
Copy link
Collaborator

@YaelDillies YaelDillies commented Apr 5, 2024

Scatter the content of Data.Nat.Basic across:

  • Data.Nat.Defs for the lemmas having no dependencies
  • Algebra.Group.Nat for the monoid instances and the few miscellaneous lemmas needing them.
  • Algebra.Ring.Nat for the semiring instance and the few miscellaneous lemmas following it.

Similarly, scatter

  • Data.Int.Basic across Data.Int.Defs, Algebra.Group.Int, Algebra.Ring.Int
  • Data.Nat.Order.Basic across Data.Nat.Defs, Algebra.Order.Group.Nat, Algebra.Order.Ring.Nat
  • Data.Int.Order.Basic across Data.Int.Defs, Algebra.Order.Group.Int, Algebra.Order.Ring.Int

Also move a few lemmas from Data.Nat.Order.Lemmas to Data.Nat.Defs.

Before
pre_11924

After
post_11924


Open in Gitpod

Scatter the content of `Data.Nat.Basic` across:
* `Data.Nat.Defs` for the lemmas having no dependencies
* `Algebra.Group.Nat` for the monoid instances and the few miscellaneous lemmas needing them.
* `Algebra.Ring.Nat` for the semiring instance and the few miscellaneous lemmas following it.

Similarly, scatter
* `Data.Int.Basic` across `Data.Int.Defs`, `Algebra.Group.Int`, `Algebra.Ring.Int`
* `Data.Nat.Order.Basic` across `Data.Nat.Defs`, `Algebra.Order.Group.Nat`, `Algebra.Order.Ring.Nat`
* `Data.Int.Order.Basic` across `Data.Int.Defs`, `Algebra.Order.Group.Int`, `Algebra.Order.Ring.Int`

Also move a few lemmas from `Data.Nat.Order.Lemmas` to `Data.Nat.Defs`.
Mathlib.lean Outdated Show resolved Hide resolved
Mathlib.lean Outdated Show resolved Hide resolved
Mathlib.lean Outdated Show resolved Hide resolved
Mathlib.lean Outdated Show resolved Hide resolved
@YaelDillies YaelDillies added awaiting-review The author would like community review of the PR awaiting-CI t-algebra Algebra (groups, rings, fields etc) t-order Order theory labels Apr 5, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 5, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 5, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 5, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added merge-conflict The PR has a merge conflict with master, and needs manual merging. and removed merge-conflict The PR has a merge conflict with master, and needs manual merging. labels Apr 6, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 6, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 7, 2024
@semorrison
Copy link
Contributor

Sorry, just acquired another merge conflict.

bors d+

@mathlib-bors
Copy link
Contributor

mathlib-bors bot commented Apr 7, 2024

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

@github-actions github-actions bot removed the awaiting-review The author would like community review of the PR label Apr 7, 2024
@YaelDillies
Copy link
Collaborator Author

That was an easy one to fix.

bors merge

@mathlib-bors
Copy link
Contributor

mathlib-bors bot commented Apr 7, 2024

👎 Rejected by label

@YaelDillies YaelDillies removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Apr 7, 2024
@YaelDillies
Copy link
Collaborator Author

bors merge

mathlib-bors bot pushed a commit that referenced this pull request Apr 7, 2024
#11924)

Scatter the content of `Data.Nat.Basic` across:
* `Data.Nat.Defs` for the lemmas having no dependencies
* `Algebra.Group.Nat` for the monoid instances and the few miscellaneous lemmas needing them.
* `Algebra.Ring.Nat` for the semiring instance and the few miscellaneous lemmas following it.

Similarly, scatter
* `Data.Int.Basic` across `Data.Int.Defs`, `Algebra.Group.Int`, `Algebra.Ring.Int`
* `Data.Nat.Order.Basic` across `Data.Nat.Defs`, `Algebra.Order.Group.Nat`, `Algebra.Order.Ring.Nat`
* `Data.Int.Order.Basic` across `Data.Int.Defs`, `Algebra.Order.Group.Int`, `Algebra.Order.Ring.Int`

Also move a few lemmas from `Data.Nat.Order.Lemmas` to `Data.Nat.Defs`.

Before
![pre_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/be8a6259-9d2d-434d-b4a5-f5667feb9e1d)

After
![post_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/3944f37f-8cfd-4254-830b-d0dbcd23b50a)
@mathlib-bors
Copy link
Contributor

mathlib-bors bot commented Apr 7, 2024

Pull request successfully merged into master.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title chore: Split Data.{Nat,Int}{.Order}.Basic in group vs ring instances [Merged by Bors] - chore: Split Data.{Nat,Int}{.Order}.Basic in group vs ring instances Apr 7, 2024
@mathlib-bors mathlib-bors bot closed this Apr 7, 2024
@mathlib-bors mathlib-bors bot deleted the move_nat_int_basic branch April 7, 2024 08:13
Louddy pushed a commit that referenced this pull request Apr 15, 2024
#11924)

Scatter the content of `Data.Nat.Basic` across:
* `Data.Nat.Defs` for the lemmas having no dependencies
* `Algebra.Group.Nat` for the monoid instances and the few miscellaneous lemmas needing them.
* `Algebra.Ring.Nat` for the semiring instance and the few miscellaneous lemmas following it.

Similarly, scatter
* `Data.Int.Basic` across `Data.Int.Defs`, `Algebra.Group.Int`, `Algebra.Ring.Int`
* `Data.Nat.Order.Basic` across `Data.Nat.Defs`, `Algebra.Order.Group.Nat`, `Algebra.Order.Ring.Nat`
* `Data.Int.Order.Basic` across `Data.Int.Defs`, `Algebra.Order.Group.Int`, `Algebra.Order.Ring.Int`

Also move a few lemmas from `Data.Nat.Order.Lemmas` to `Data.Nat.Defs`.

Before
![pre_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/be8a6259-9d2d-434d-b4a5-f5667feb9e1d)

After
![post_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/3944f37f-8cfd-4254-830b-d0dbcd23b50a)
atarnoam pushed a commit that referenced this pull request Apr 16, 2024
#11924)

Scatter the content of `Data.Nat.Basic` across:
* `Data.Nat.Defs` for the lemmas having no dependencies
* `Algebra.Group.Nat` for the monoid instances and the few miscellaneous lemmas needing them.
* `Algebra.Ring.Nat` for the semiring instance and the few miscellaneous lemmas following it.

Similarly, scatter
* `Data.Int.Basic` across `Data.Int.Defs`, `Algebra.Group.Int`, `Algebra.Ring.Int`
* `Data.Nat.Order.Basic` across `Data.Nat.Defs`, `Algebra.Order.Group.Nat`, `Algebra.Order.Ring.Nat`
* `Data.Int.Order.Basic` across `Data.Int.Defs`, `Algebra.Order.Group.Int`, `Algebra.Order.Ring.Int`

Also move a few lemmas from `Data.Nat.Order.Lemmas` to `Data.Nat.Defs`.

Before
![pre_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/be8a6259-9d2d-434d-b4a5-f5667feb9e1d)

After
![post_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/3944f37f-8cfd-4254-830b-d0dbcd23b50a)
uniwuni pushed a commit that referenced this pull request Apr 19, 2024
#11924)

Scatter the content of `Data.Nat.Basic` across:
* `Data.Nat.Defs` for the lemmas having no dependencies
* `Algebra.Group.Nat` for the monoid instances and the few miscellaneous lemmas needing them.
* `Algebra.Ring.Nat` for the semiring instance and the few miscellaneous lemmas following it.

Similarly, scatter
* `Data.Int.Basic` across `Data.Int.Defs`, `Algebra.Group.Int`, `Algebra.Ring.Int`
* `Data.Nat.Order.Basic` across `Data.Nat.Defs`, `Algebra.Order.Group.Nat`, `Algebra.Order.Ring.Nat`
* `Data.Int.Order.Basic` across `Data.Int.Defs`, `Algebra.Order.Group.Int`, `Algebra.Order.Ring.Int`

Also move a few lemmas from `Data.Nat.Order.Lemmas` to `Data.Nat.Defs`.

Before
![pre_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/be8a6259-9d2d-434d-b4a5-f5667feb9e1d)

After
![post_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/3944f37f-8cfd-4254-830b-d0dbcd23b50a)
callesonne pushed a commit that referenced this pull request Apr 22, 2024
#11924)

Scatter the content of `Data.Nat.Basic` across:
* `Data.Nat.Defs` for the lemmas having no dependencies
* `Algebra.Group.Nat` for the monoid instances and the few miscellaneous lemmas needing them.
* `Algebra.Ring.Nat` for the semiring instance and the few miscellaneous lemmas following it.

Similarly, scatter
* `Data.Int.Basic` across `Data.Int.Defs`, `Algebra.Group.Int`, `Algebra.Ring.Int`
* `Data.Nat.Order.Basic` across `Data.Nat.Defs`, `Algebra.Order.Group.Nat`, `Algebra.Order.Ring.Nat`
* `Data.Int.Order.Basic` across `Data.Int.Defs`, `Algebra.Order.Group.Int`, `Algebra.Order.Ring.Int`

Also move a few lemmas from `Data.Nat.Order.Lemmas` to `Data.Nat.Defs`.

Before
![pre_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/be8a6259-9d2d-434d-b4a5-f5667feb9e1d)

After
![post_11924](https://github.com/leanprover-community/mathlib4/assets/14090593/3944f37f-8cfd-4254-830b-d0dbcd23b50a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
delegated t-algebra Algebra (groups, rings, fields etc) t-order Order theory
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants