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

collections finalization mega-squash #22491

Closed
wants to merge 5 commits into from
Closed

Conversation

Gankra
Copy link
Contributor

@Gankra Gankra commented Feb 18, 2015

This PR merges #22489 and #22483 to provide the collection renames of RFC 580, and changes to Extend and FromIterator to take IntoIterator instead of Iterator (see individual commits for details).

@rust-highfive
Copy link
Collaborator

r? @huonw

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

@Gankra
Copy link
Contributor Author

Gankra commented Feb 18, 2015

@bors r=aturon,Gankro,nmatsakis 93dc5043

@Gankra Gankra mentioned this pull request Feb 18, 2015
aturon and others added 3 commits February 18, 2015 14:01
This commit implements RFC 580 by renaming:

* DList -> LinkedList
* Bitv -> BitVec
* BitvSet -> BitSet
* RingBuf -> VecDeque

More details are in [the
RFC](rust-lang/rfcs#580)

[breaking-change]
This breaks all implementors of Extend, as they must now accept IntoIterator instead of Iterator. The fix for this is generally trivial (change the bound, and maybe call into_iter() on the argument to get the old argument).

Users of Extend should be unaffected because Iterators are IntoIterator.

[breaking-change]
This breaks all implementors of FromIterator, as they must now accept IntoIterator instead of Iterator. The fix for this is generally trivial (change the bound, and maybe call into_iter() on the argument to get the old argument).

Users of FromIterator should be unaffected because Iterators are IntoIterator.

[breaking-change]
@Gankra
Copy link
Contributor Author

Gankra commented Feb 18, 2015

@bors r=aturon,Gankro,nmatsakis 66613e2

(fixed some doc typos)

@aturon
Copy link
Member

aturon commented Feb 18, 2015

@bors: p=1 (trying to land this before alpha2)

@bors
Copy link
Contributor

bors commented Feb 18, 2015

⌛ Testing commit 66613e2 with merge 6f1c9f3...

@bors
Copy link
Contributor

bors commented Feb 18, 2015

💔 Test failed - auto-mac-64-opt

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Feb 19, 2015
Conflicts:
	src/libcollections/bit.rs
	src/libcollections/linked_list.rs
	src/libcollections/vec_deque.rs
	src/libstd/sys/common/wtf8.rs
@Gankra
Copy link
Contributor Author

Gankra commented Feb 19, 2015

Whoops, minor rebase error. Gave the fix to acrichto for his rollup.

@alexcrichton
Copy link
Member

Merged in #22541

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants