Skip to content

Commit

Permalink
Auto merge of #34153 - apasel422:btree, r=alexcrichton
Browse files Browse the repository at this point in the history
Update tracking issue for `{BTreeMap, BTreeSet}::{append, split_off}`

r? @alexcrichton
  • Loading branch information
bors authored Jun 11, 2016
2 parents 7d8e6dd + 9bf5dac commit 35841ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/libcollections/btree/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
/// assert_eq!(a[&5], "f");
/// ```
#[unstable(feature = "btree_append", reason = "recently added as part of collections reform 2",
issue = "19986")]
issue = "34152")]
pub fn append(&mut self, other: &mut Self) {
// Do we have to append anything at all?
if other.len() == 0 {
Expand Down Expand Up @@ -938,7 +938,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
/// ```
#[unstable(feature = "btree_split_off",
reason = "recently added as part of collections reform 2",
issue = "19986")]
issue = "34152")]
pub fn split_off<Q: ?Sized + Ord>(&mut self, key: &Q) -> Self
where K: Borrow<Q>
{
Expand Down
4 changes: 2 additions & 2 deletions src/libcollections/btree/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ impl<T: Ord> BTreeSet<T> {
/// assert!(a.contains(&5));
/// ```
#[unstable(feature = "btree_append", reason = "recently added as part of collections reform 2",
issue = "19986")]
issue = "34152")]
pub fn append(&mut self, other: &mut Self) {
self.map.append(&mut other.map);
}
Expand Down Expand Up @@ -613,7 +613,7 @@ impl<T: Ord> BTreeSet<T> {
/// ```
#[unstable(feature = "btree_split_off",
reason = "recently added as part of collections reform 2",
issue = "19986")]
issue = "34152")]
pub fn split_off<Q: ?Sized + Ord>(&mut self, key: &Q) -> Self where T: Borrow<Q> {
BTreeSet { map: self.map.split_off(key) }
}
Expand Down

0 comments on commit 35841ee

Please sign in to comment.