From e365974750570c4e17cb02e66f0aa4f27b6776f5 Mon Sep 17 00:00:00 2001
From: Stjepan Glavina <stjepang@gmail.com>
Date: Fri, 17 Mar 2017 22:51:59 +0100
Subject: [PATCH] Address Alex's PR comments

---
 src/libcollections/lib.rs   | 2 +-
 src/libcollections/slice.rs | 6 ++++++
 src/libcore/slice/sort.rs   | 2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 9809db77f08..72e950bc91f 100644
--- 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 c915d8b9e56..ca87ee1063b 100644
--- a/src/libcollections/slice.rs
+++ b/src/libcollections/slice.rs
@@ -1173,6 +1173,8 @@ impl<T> [T] {
     /// # Examples
     ///
     /// ```
+    /// #![feature(sort_unstable)]
+    ///
     /// let mut v = [-5, 4, 1, -3, 2];
     ///
     /// v.sort_unstable();
@@ -1208,6 +1210,8 @@ impl<T> [T] {
     /// # 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 @@ impl<T> [T] {
     /// # 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 7c751b5c5a3..5434bbbbf8c 100644
--- 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;