Skip to content

[Merged by Bors] - chore: Split Data.{Nat,Int}{.Order}.Basic in group vs ring instances - #11924

Closed
YaelDillies wants to merge 13 commits into
masterfrom
move_nat_int_basic
Closed

[Merged by Bors] - chore: Split Data.{Nat,Int}{.Order}.Basic in group vs ring instances#11924
YaelDillies wants to merge 13 commits into
masterfrom
move_nat_int_basic

Conversation

@YaelDillies

@YaelDillies YaelDillies commented Apr 5, 2024

Copy link
Copy Markdown
Contributor

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`.
Comment thread Mathlib.lean Outdated
Comment thread Mathlib.lean Outdated
Comment thread Mathlib.lean Outdated
Comment thread Mathlib.lean Outdated
@YaelDillies YaelDillies added awaiting-review awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. t-algebra Algebra (groups, rings, fields, etc) t-order Order theory labels Apr 5, 2024
@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 5, 2024
@ghost ghost removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 5, 2024
@github-actions github-actions Bot removed the awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. label Apr 5, 2024
@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 5, 2024
@ghost ghost added merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) and removed merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) labels Apr 6, 2024
@ghost ghost removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 6, 2024
@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 7, 2024
@kim-em

kim-em commented Apr 7, 2024

Copy link
Copy Markdown
Contributor

Sorry, just acquired another merge conflict.

bors d+

@mathlib-bors

mathlib-bors Bot commented Apr 7, 2024

Copy link
Copy Markdown
Contributor

✌️ 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 added the delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). label Apr 7, 2024
@YaelDillies

Copy link
Copy Markdown
Contributor Author

That was an easy one to fix.

bors merge

@mathlib-bors

mathlib-bors Bot commented Apr 7, 2024

Copy link
Copy Markdown
Contributor

👎 Rejected by label

@YaelDillies YaelDillies removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 7, 2024
@YaelDillies

Copy link
Copy Markdown
Contributor 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

mathlib-bors Bot commented Apr 7, 2024

Copy link
Copy Markdown
Contributor

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
xgenereux 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 This pull request has been delegated to the PR author (or occasionally another non-maintainer). t-algebra Algebra (groups, rings, fields, etc) t-order Order theory

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants