diff options
| author | bors <bors@rust-lang.org> | 2016-10-12 14:42:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 14:42:12 -0700 |
| commit | d34318dd538bf4c9175e4138b3e4188ea8211620 (patch) | |
| tree | a18e44fe88822453f71d47bfa3b4c89e9d8ed58d /src/libstd/sys | |
| parent | 9cb01365eed598811aef847a8ee414dab576f3c8 (diff) | |
| parent | 27043b15af9b1720bdcb6c355df849ebd51e7f8a (diff) | |
| download | rust-d34318dd538bf4c9175e4138b3e4188ea8211620.tar.gz rust-d34318dd538bf4c9175e4138b3e4188ea8211620.zip | |
Auto merge of #37118 - alexcrichton:rollup, r=alexcrichton
Rollup of 17 pull requests - Successful merges: #36762, #36831, #36973, #36991, #36995, #37023, #37049, #37050, #37056, #37064, #37066, #37067, #37084, #37089, #37091, #37092, #37110 - Failed merges:
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(), |