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

Misc Stabilization for collections #20053

Merged
merged 1 commit into from
Dec 23, 2014
Merged

Misc Stabilization for collections #20053

merged 1 commit into from
Dec 23, 2014

Conversation

csouth3
Copy link
Contributor

@csouth3 csouth3 commented Dec 20, 2014

This pull request:

*Renames BinaryHeap::top to BinaryHeap::peek
*Stabilizes front/back/front_mut/back_mut in DList and RingBuf
*Stabilizes swap in RingBuf

in accordance with rust-lang/rfcs#509.

Note that this PR does not address Bitv::{get,set} or HashMap's iterators, nor does it move std::vec to std::collections::vec, all of which still need to be done.

Because of the method renaming, this is a [breaking-change].

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@csouth3
Copy link
Contributor Author

csouth3 commented Dec 20, 2014

r? @gankro

@rust-highfive rust-highfive assigned Gankra and unassigned alexcrichton Dec 20, 2014
///
/// ```
pub fn top<'a>(&'a self) -> Option<&'a T> {
pub fn peek<'a>(&'a self) -> Option<&'a T> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs stability marker.

@Gankra
Copy link
Contributor

Gankra commented Dec 20, 2014

Just the one nit. (I found one so that means I did a good job, right?)

Also as an aside I just realized that I left Bitv::set to be stabilized, which I don't think I ultimately wanted. I thought I had changed that in the RFC, but I guess not?

@csouth3
Copy link
Contributor Author

csouth3 commented Dec 20, 2014

It's certainly left to be stabilized, but the language is quite tentative, e.g.
"set may want to wait on IndexSet being a thing (see Alternatives)."
So I didn't touch it :D

Anyway, I added that missing stability marker.

@alexcrichton
Copy link
Member

Needs a rebase

@csouth3
Copy link
Contributor Author

csouth3 commented Dec 22, 2014

Oof...Currently doing a build...I'll get this rebased ASAP!

This commit:

*Renames `BinaryHeap::top` to `BinaryHeap::peek`
*Stabilizes `front/back/front_mut/back_mut` in `DList` and `RingBuf`
*Stabilizes `swap` in `RingBuf`

Because of the method renaming, this is a [breaking-change].
@csouth3
Copy link
Contributor Author

csouth3 commented Dec 22, 2014

Rebased! cc @alexcrichton @gankro

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Dec 22, 2014
This pull request:

*Renames `BinaryHeap::top` to `BinaryHeap::peek`
*Stabilizes `front/back/front_mut/back_mut` in `DList` and `RingBuf`
*Stabilizes `swap` in `RingBuf`

in accordance with rust-lang/rfcs#509.

Note that this PR does not address `Bitv::{get,set}` or HashMap's iterators, nor does it move `std::vec` to `std::collections::vec`, all of which still need to be done.

Because of the method renaming, this is a [breaking-change].
@bors bors merged commit abf492d into rust-lang:master Dec 23, 2014
@csouth3 csouth3 deleted the misc-stab branch December 23, 2014 05:34
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.

5 participants