Address Alex's PR comments

diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 9809db77f080e82f872a42fc782681f6a0f81412..72e950bc91fa978a37b6a927f8fd0208579a8984 100644 (file)
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -52,7 +52,7 @@
 #![feature(shared)]
 #![feature(slice_get_slice)]
 #![feature(slice_patterns)]
-#![feature(sort_unstable)]
+#![cfg_attr(not(test), feature(sort_unstable))]
 #![feature(specialization)]
 #![feature(staged_api)]
 #![feature(str_internals)]

diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs
index c915d8b9e563d532486525b4d00b61157232bd63..ca87ee1063b87c320120838fbd84e6882749c8ce 100644 (file)
--- a/src/libcollections/slice.rs
+++ b/src/libcollections/slice.rs
@@ -1173,6 +1173,8 @@ pub fn sort_by_key<B, F>(&mut self, mut f: F)
     /// # Examples
     ///
     /// ```
+    /// #![feature(sort_unstable)]
+    ///
     /// let mut v = [-5, 4, 1, -3, 2];
     ///
     /// v.sort_unstable();
@@ -1208,6 +1210,8 @@ pub fn sort_unstable(&mut self)
     /// # Examples
     ///
     /// ```
+    /// #![feature(sort_unstable)]
+    ///
     /// let mut v = [5, 4, 1, 3, 2];
     /// v.sort_unstable_by(|a, b| a.cmp(b));
     /// assert!(v == [1, 2, 3, 4, 5]);
@@ -1246,6 +1250,8 @@ pub fn sort_unstable_by<F>(&mut self, compare: F)
     /// # Examples
     ///
     /// ```
+    /// #![feature(sort_unstable)]
+    ///
     /// let mut v = [-5i32, 4, 1, -3, 2];
     ///
     /// v.sort_unstable_by_key(|k| k.abs());

diff --git a/src/libcore/slice/sort.rs b/src/libcore/slice/sort.rs
index 7c751b5c5a38659e89ad38a40691a61019b36383..5434bbbbf8c03a3b0d51938ad11777d5a9bc5aec 100644 (file)
--- a/src/libcore/slice/sort.rs
+++ b/src/libcore/slice/sort.rs
@@ -16,8 +16,6 @@
 //! Unstable sorting is compatible with libcore because it doesn't allocate memory, unlike our
 //! stable sorting implementation.
 
-#![unstable(feature = "sort_unstable", issue = "40585")]
-
 use cmp;
 use mem;
 use ptr;