diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-01-22 12:33:46 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-23 15:50:03 -0800 |
| commit | 9758c488a94e77cc8a110a6783a99cf5b91326db (patch) | |
| tree | ca5f2436cb4b9dc39aa7f525cf4a5fc9288d0ac7 /src/libstd/sync | |
| parent | cd6d9eab5d75584edfcae4ffdef8b0836db80c1e (diff) | |
| download | rust-9758c488a94e77cc8a110a6783a99cf5b91326db.tar.gz rust-9758c488a94e77cc8a110a6783a99cf5b91326db.zip | |
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
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/poison.rs | 3 |
1 files changed, 2 insertions, 1 deletions
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 |