about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2017-05-10 21:17:24 -0700
committerSteven Fackler <sfackler@gmail.com>2017-05-20 21:58:47 -0700
commit7c2cd93b2bf3c84b97ea798617105a6f85529d23 (patch)
tree0eee8e5518460e34ae3f1183fc137d8d79147ed9 /src/libcollections
parentd8215fc238a974950fcd4155a34f5383ebb589b9 (diff)
Stabilize library features for 1.18.0
Closes #38863
Closes #38980
Closes #38903
Closes #36648
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/binary_heap.rs2
-rw-r--r--src/libcollections/tests/lib.rs1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs
index 7d972403f65..4e9dea09f79 100644
--- a/src/libcollections/binary_heap.rs
+++ b/src/libcollections/binary_heap.rs
@@ -268,7 +268,7 @@ impl<'a, T: Ord> DerefMut for PeekMut<'a, T> {
 
 impl<'a, T: Ord> PeekMut<'a, T> {
     /// Removes the peeked value from the heap and returns it.
-    #[unstable(feature = "binary_heap_peek_mut_pop", issue = "38863")]
+    #[stable(feature = "binary_heap_peek_mut_pop", since = "1.18.0")]
     pub fn pop(mut this: PeekMut<'a, T>) -> T {
         let value = this.heap.pop().unwrap();
         this.sift = false;
diff --git a/src/libcollections/tests/lib.rs b/src/libcollections/tests/lib.rs
index eae3bf3915f..cda8c6d5998 100644
--- a/src/libcollections/tests/lib.rs
+++ b/src/libcollections/tests/lib.rs
@@ -10,7 +10,6 @@
 
 #![deny(warnings)]
 
-#![feature(binary_heap_peek_mut_pop)]
 #![feature(box_syntax)]
 #![feature(inclusive_range_syntax)]
 #![feature(collection_placement)]