From 9758c488a94e77cc8a110a6783a99cf5b91326db Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 22 Jan 2015 12:33:46 -0800
Subject: Deprecated attributes don't take 'feature' names and are paired with
 stable/unstable

Conflicts:
	src/libcore/atomic.rs
	src/libcore/finally.rs
	src/test/auxiliary/inherited_stability.rs
	src/test/auxiliary/lint_stability.rs
---
 src/libstd/sync/poison.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libstd/sync')

diff --git a/src/libstd/sync/poison.rs b/src/libstd/sync/poison.rs
index d2362eefcf1..f5bb7a56d77 100644
--- a/src/libstd/sync/poison.rs
+++ b/src/libstd/sync/poison.rs
@@ -105,7 +105,8 @@ impl<T> Error for PoisonError<T> {
 impl<T> PoisonError<T> {
     /// Consumes this error indicating that a lock is poisoned, returning the
     /// underlying guard to allow access regardless.
-    #[deprecated(feature = "oldstuff", since = "1.0.0", reason = "renamed to into_inner")]
+    #[unstable(feature = "std_misc")]
+    #[deprecated(since = "1.0.0", reason = "renamed to into_inner")]
     pub fn into_guard(self) -> T { self.guard }
 
     /// Consumes this error indicating that a lock is poisoned, returning the
-- 
cgit 1.4.1-3-g733a5