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

Split core/num/mod.rs to smaller mods #76327

Merged
merged 6 commits into from
Sep 19, 2020
Merged

Split core/num/mod.rs to smaller mods #76327

merged 6 commits into from
Sep 19, 2020

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented Sep 4, 2020 •
edited
Loading

Note for reviewer:

  • I split to multiple commits for easier reviewing, but I could git squash them all to one if requested.
  • Recommend pulling this change locally and using advanced git diff viewer or this command: 
    git show --reverse --color-moved=dimmed-zebra master..

I split core/num/mod.rs to these modules:

  • error: For error structs like ParseIntError.
  • blanket shells dir: For dummy number type modules: std::i32, std::f32, and the likes. Why? See below.
  • int_macros and uint_macros: Real implementation of all integer types via int_impl and uint_impl
  • nonzero: For NonZero* types and their implementations.
  • wrapping: For Wrapping<T> types.

@tesuji
Copy link
Contributor Author

tesuji commented Sep 4, 2020 •
edited
Loading

cc #60302
r? @sfackler for review or reassignment.

@rustbot modify labels: +S-waiting-on-review

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 4, 2020
@bors
Copy link
Contributor

bors commented Sep 7, 2020

☔ The latest upstream changes (presumably #76422) made this pull request unmergeable. Please resolve the merge conflicts.

@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Sep 8, 2020
@bors
Copy link
Contributor

bors commented Sep 10, 2020

☔ The latest upstream changes (presumably #76540) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@tesuji
Copy link
Contributor Author

tesuji commented Sep 10, 2020

Rebased.

@tesuji
Copy link
Contributor Author

tesuji commented Sep 11, 2020

r? @KodrAus

@rust-highfive rust-highfive assigned KodrAus and unassigned sfackler Sep 11, 2020
@bors
Copy link
Contributor

bors commented Sep 16, 2020

☔ The latest upstream changes (presumably #76804) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@tesuji
Copy link
Contributor Author

tesuji commented Sep 17, 2020

Rebased.

@tesuji tesuji mentioned this pull request Sep 17, 2020
Open
7 tasks
@varkor
Copy link
Member

varkor commented Sep 19, 2020

@rust-lang/libs: is there someone who could review this PR? It bitrots quite quickly.

@SimonSapin
Copy link
Contributor

Looks good, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Sep 19, 2020

📌 Commit 5cb99ae3a56c07f8f3463bada49c4756ec7a29e0 has been approved by SimonSapin

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 19, 2020
@bors
Copy link
Contributor

bors commented Sep 19, 2020

☔ The latest upstream changes (presumably #76912) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 19, 2020
@varkor
Copy link
Member

varkor commented Sep 19, 2020

@lzutao: could you rebase once more? I'll increase the priority of the PR, so it shouldn't happen again.

@bors p=100

@tesuji
Copy link
Contributor Author

tesuji commented Sep 19, 2020

Done. Reviewer could run

git range-diff 5cb99ae3a56c07f8f3463bada49c4756ec7a29e0...a50ec5f144b414d3c14fe04fc07f935c2ea0ab0f

locally to get the diff.

@SimonSapin
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 19, 2020

📌 Commit a50ec5f has been approved by SimonSapin

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 19, 2020
@bors
Copy link
Contributor

bors commented Sep 19, 2020

⌛ Testing commit a50ec5f with merge 59fb88d...

@bors
Copy link
Contributor

bors commented Sep 19, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: SimonSapin
Pushing 59fb88d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 19, 2020
@bors bors merged commit 59fb88d into rust-lang:master Sep 19, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 19, 2020
This was referenced Sep 19, 2020
Merged
Merged
@tesuji tesuji deleted the split-core-num branch September 20, 2020 01:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@KodrAus KodrAus

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.
8 participants
@tesuji @bors @varkor @SimonSapin @sfackler @KodrAus @jyn514 @rustbot