Skip to content

Split core::iter module implementation into parts #33079

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Apr 22, 2016

Conversation

bluss
Copy link
Member

@bluss bluss commented Apr 18, 2016

Split core::iter module implementation into parts

split iter.rs into a directory of (implementation private) modules.

  • mod (adaptor structs whose private fields need to be available both for them and Iterator
    • iterator (Iterator trait)
    • traits (FromIterator, etc; all traits but Iterator itself)
    • range (range related)
    • sources (Repeat, Once, Empty)

split iter.rs into a directory of (implementation private) modules.

+ mod Adaptor structs
  - Private fields need to be available both for them and Iterator
+ iterator (Iterator trait)
+ traits (FromIterator, traits but Iterator itself)
+ range (range related)
+ sources (Repeat, Once, Empty)
@rust-highfive
Copy link
Contributor

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@bluss
Copy link
Member Author

bluss commented Apr 18, 2016

I was looking for a good diff tool to display / review this with.

No functional change (of course). Only edits are license headers and use/mod lines.

This git command makes it show a diff between iter.rs and each output file at least:

git diff --diff-algorithm=minimal  -M01 -C01 HEAD~2 -p --stat

@alexcrichton
Copy link
Member

Nice!

Currently mod.rs starts with a couple of implementations of ExactSizeIterator, but could they move to their relevant adaptor like the other impelmentations of ExactSizeIterator?

Other than that this basically all looks good to me! r=me with that minor change

@bluss
Copy link
Member Author

bluss commented Apr 18, 2016

No diff is too big for you! I've moved the ESI impls now, that's a good thing to do anyway.

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 18, 2016

📌 Commit 1cd8d1e has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 21, 2016

⌛ Testing commit 1cd8d1e with merge 6307e2b...

@bors
Copy link
Collaborator

bors commented Apr 21, 2016

💔 Test failed - auto-win-gnu-64-nopt-t

@bluss
Copy link
Member Author

bluss commented Apr 21, 2016

@bors retry

@bors
Copy link
Collaborator

bors commented Apr 21, 2016

⌛ Testing commit 1cd8d1e with merge d53909f...

@bors
Copy link
Collaborator

bors commented Apr 21, 2016

💔 Test failed - auto-win-msvc-32-opt

@alexcrichton
Copy link
Member

@bors: retry

On Thu, Apr 21, 2016 at 8:37 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-msvc-32-opt
http://buildbot.rust-lang.org/builders/auto-win-msvc-32-opt/builds/3089


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#33079 (comment)

@bors
Copy link
Collaborator

bors commented Apr 21, 2016

💔 Test failed - auto-win-gnu-32-nopt-t

@alexcrichton
Copy link
Member

@bors: retry

On Thu, Apr 21, 2016 at 10:58 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-gnu-32-nopt-t
http://buildbot.rust-lang.org/builders/auto-win-gnu-32-nopt-t/builds/3884


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#33079 (comment)

@bors
Copy link
Collaborator

bors commented Apr 21, 2016

⌛ Testing commit 1cd8d1e with merge 887e947...

bors added a commit that referenced this pull request Apr 21, 2016
Split core::iter module implementation into parts

Split core::iter module implementation into parts

split iter.rs into a directory of (implementation private) modules.

+ mod (adaptor structs whose private fields need to be available both for them and Iterator
  + iterator (Iterator trait)
  + traits (FromIterator, etc; all traits but Iterator itself)
  + range (range related)
  + sources (Repeat, Once, Empty)
@bors
Copy link
Collaborator

bors commented Apr 22, 2016

💔 Test failed - auto-win-msvc-32-opt

@alexcrichton
Copy link
Member

@bors: retry

On Thu, Apr 21, 2016 at 6:11 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-msvc-32-opt
http://buildbot.rust-lang.org/builders/auto-win-msvc-32-opt/builds/3098


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#33079 (comment)

@bors bors merged commit 1cd8d1e into rust-lang:master Apr 22, 2016
@bluss bluss deleted the split-iter branch April 22, 2016 12:00
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants