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

Refactor core::iter module #56932

Merged
merged 17 commits into from
Jan 27, 2019
Merged

Refactor core::iter module #56932

merged 17 commits into from
Jan 27, 2019

Conversation

clarfonthey
Copy link
Contributor

@clarfonthey clarfonthey commented Dec 17, 2018

A while back, I refactored core::ops in #42523 because the module had become a giant mess and was difficult to modify. Now, I'm doing the same with the core::iter module.

Like the core::ops refactor, things have been split up into multiple commits to make rebasing easier, and so that you can follow changes. Although the diffs are hard to decipher, the only actual code changes I've made in the first few commits are to modify exports and imports. I save all of the actual code refactoring, e.g. modifying what methods are called, for the end.

@rust-highfive

This comment has been minimized.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2018
@clarfonthey clarfonthey force-pushed the iter_refactor branch 7 times, most recently from 63dcfa3 to 46ec648 Compare December 17, 2018 22:38
@rust-highfive

This comment has been minimized.

@clarfonthey clarfonthey force-pushed the iter_refactor branch 2 times, most recently from 6ecb30d to 5ea4df3 Compare December 17, 2018 23:18
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@clarfonthey clarfonthey force-pushed the iter_refactor branch 2 times, most recently from 64dc651 to 674d5b2 Compare December 17, 2018 23:57
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@clarfonthey clarfonthey force-pushed the iter_refactor branch 5 times, most recently from f3f6f6d to a7f5ef3 Compare December 18, 2018 00:37
@rust-highfive

This comment has been minimized.

@clarfonthey
Copy link
Contributor Author

This is ready to merge! If @bluss isn't available to review, maybe someone else could?

@Centril
Copy link
Contributor

Centril commented Jan 27, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned bluss Jan 27, 2019
@Centril
Copy link
Contributor

Centril commented Jan 27, 2019

There are some other tweaks like moving LoopState to its own file that might be good, but this is great and I don't think we should grow the changes in this PR.

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jan 27, 2019

📌 Commit 02bda7a has been approved by Centril

@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 Jan 27, 2019
@clarfonthey
Copy link
Contributor Author

Thank you so much @Centril! I agree with you on LoopState but as you said, it can be moved later.

@bors
Copy link
Contributor

bors commented Jan 27, 2019

⌛ Testing commit 02bda7a with merge da6ab95...

bors added a commit that referenced this pull request Jan 27, 2019
Refactor core::iter module

A while back, I refactored `core::ops` in #42523 because the module had become a giant mess and was difficult to modify. Now, I'm doing the same with the `core::iter` module.

Like the `core::ops` refactor, things have been split up into multiple commits to make rebasing easier, and so that you can follow changes. Although the diffs are hard to decipher, the only actual code changes I've made in the first few commits are to modify exports and imports. I save all of the actual code refactoring, e.g. modifying what methods are called, for the end.
@bors
Copy link
Contributor

bors commented Jan 27, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing da6ab95 to master...

@bors bors merged commit 02bda7a into rust-lang:master Jan 27, 2019
@clarfonthey clarfonthey deleted the iter_refactor branch January 31, 2019 05:45
@qnighy qnighy mentioned this pull request Dec 22, 2019
Centril pushed a commit to Centril/rust that referenced this pull request Dec 22, 2019
The contents of this file have been moved in rust-lang#56932 (520e8b0) and the
file should have been removed as well.
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
…-DPC

Remove iter_private.rs

The contents of this file have been moved in rust-lang#56932 (520e8b0) and the file should have been removed as well.
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
…-DPC

Remove iter_private.rs

The contents of this file have been moved in rust-lang#56932 (520e8b0) and the file should have been removed as well.
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
…-DPC

Remove iter_private.rs

The contents of this file have been moved in rust-lang#56932 (520e8b0) and the file should have been removed as well.
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
…-DPC

Remove iter_private.rs

The contents of this file have been moved in rust-lang#56932 (520e8b0) and the file should have been removed as well.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants