diff options
| author | Jonathan Reem <jonathan.reem@gmail.com> | 2016-02-11 17:24:57 -0800 |
|---|---|---|
| committer | Jonathan Reem <jonathan.reem@gmail.com> | 2016-02-11 17:24:57 -0800 |
| commit | 8bbb70cb94bfbe485e94994b2da35675597586c6 (patch) | |
| tree | d8f098df1dc64bb243f68d142db9a41b9ffd7786 /src/libstd/sys/common | |
| parent | 98ec51a4ddc5519f809d667e7dbbf636d59ab653 (diff) | |
| download | rust-8bbb70cb94bfbe485e94994b2da35675597586c6.tar.gz rust-8bbb70cb94bfbe485e94994b2da35675597586c6.zip | |
Remove unnecessary bounds on Error and Display implementations for TryLockError and PoisonError.
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/poison.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libstd/sys/common/poison.rs b/src/libstd/sys/common/poison.rs index 2cfa04c843b..d858c002755 100644 --- a/src/libstd/sys/common/poison.rs +++ b/src/libstd/sys/common/poison.rs @@ -111,7 +111,7 @@ impl<T> fmt::Display for PoisonError<T> { } #[stable(feature = "rust1", since = "1.0.0")] -impl<T: Send + Reflect> Error for PoisonError<T> { +impl<T: Reflect> Error for PoisonError<T> { fn description(&self) -> &str { "poisoned lock: another task failed inside" } @@ -158,14 +158,17 @@ impl<T> fmt::Debug for TryLockError<T> { } #[stable(feature = "rust1", since = "1.0.0")] -impl<T: Send + Reflect> fmt::Display for TryLockError<T> { +impl<T> fmt::Display for TryLockError<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - self.description().fmt(f) + match *self { + TryLockError::Poisoned(..) => "poisoned lock: another task failed inside", + TryLockError::WouldBlock => "try_lock failed because the operation would block" + }.fmt(f) } } #[stable(feature = "rust1", since = "1.0.0")] -impl<T: Send + Reflect> Error for TryLockError<T> { +impl<T: Reflect> Error for TryLockError<T> { fn description(&self) -> &str { match *self { TryLockError::Poisoned(ref p) => p.description(), |
