diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-10-12 10:15:26 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-10-12 14:07:55 -0700 |
| commit | 9d70ff384f4a87e2cfe3d5e90b27637632bb373a (patch) | |
| tree | ef14774ca0dfd2daabeee9dad6da56be1b36106d /src/libstd/sys | |
| parent | d13b102c5463d4258482815d04b93f360418245f (diff) | |
| parent | 79b5177378097ee39e595517ca76132b3a3dc0eb (diff) | |
| download | rust-9d70ff384f4a87e2cfe3d5e90b27637632bb373a.tar.gz rust-9d70ff384f4a87e2cfe3d5e90b27637632bb373a.zip | |
Rollup merge of #36995 - nrc:stable, r=@nikomatsakis
stabilise ?, attributes on stmts, deprecate Reflect r? @nikomatsakis
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/poison.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/sys/common/poison.rs b/src/libstd/sys/common/poison.rs index 55212bf35d6..bdc727f1dfc 100644 --- a/src/libstd/sys/common/poison.rs +++ b/src/libstd/sys/common/poison.rs @@ -10,7 +10,6 @@ use error::{Error}; use fmt; -use marker::Reflect; use sync::atomic::{AtomicBool, Ordering}; use thread; @@ -117,7 +116,7 @@ impl<T> fmt::Display for PoisonError<T> { } #[stable(feature = "rust1", since = "1.0.0")] -impl<T: Reflect> Error for PoisonError<T> { +impl<T> Error for PoisonError<T> { fn description(&self) -> &str { "poisoned lock: another task failed inside" } @@ -174,7 +173,7 @@ impl<T> fmt::Display for TryLockError<T> { } #[stable(feature = "rust1", since = "1.0.0")] -impl<T: Reflect> Error for TryLockError<T> { +impl<T> Error for TryLockError<T> { fn description(&self) -> &str { match *self { TryLockError::Poisoned(ref p) => p.description(), |