diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-08-07 09:27:27 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-08-12 17:58:56 -0400 |
| commit | 91b3e9cac0125e35d65169fb7e06166a078296c7 (patch) | |
| tree | 9d4ee7d97b5ffeec38060a1afa9a386cb08f233d /src/libstd | |
| parent | 788a802dad3f273b74150b732d24d37a695d29f6 (diff) | |
| download | rust-91b3e9cac0125e35d65169fb7e06166a078296c7.tar.gz rust-91b3e9cac0125e35d65169fb7e06166a078296c7.zip | |
Fallout in libs -- misc missing bounds uncovered by WF checks.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sync/mutex.rs | 2 | ||||
| -rw-r--r-- | src/libstd/thread/local.rs | 2 | ||||
| -rw-r--r-- | src/libstd/thread/scoped_tls.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 4b62434d068..773bd7f5606 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -369,7 +369,7 @@ mod tests { use sync::{Arc, Mutex, StaticMutex, Condvar}; use thread; - struct Packet<T: Send>(Arc<(Mutex<T>, Condvar)>); + struct Packet<T>(Arc<(Mutex<T>, Condvar)>); unsafe impl<T: Send> Send for Packet<T> {} unsafe impl<T> Sync for Packet<T> {} diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 3bf170b5fe2..a228cbfd85b 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -60,7 +60,7 @@ pub use self::imp::Key as __KeyInner; /// }); /// ``` #[stable(feature = "rust1", since = "1.0.0")] -pub struct LocalKey<T> { +pub struct LocalKey<T:'static> { // The key itself may be tagged with #[thread_local], and this `Key` is // stored as a `static`, and it's not valid for a static to reference the // address of another thread_local static. For this reason we kinda wonkily diff --git a/src/libstd/thread/scoped_tls.rs b/src/libstd/thread/scoped_tls.rs index 303ab0f9f01..810e3bb62f7 100644 --- a/src/libstd/thread/scoped_tls.rs +++ b/src/libstd/thread/scoped_tls.rs @@ -55,7 +55,7 @@ pub use self::imp::KeyInner as __KeyInner; #[unstable(feature = "scoped_tls", reason = "scoped TLS has yet to have wide enough use to fully consider \ stabilizing its interface")] -pub struct ScopedKey<T> { inner: fn() -> &'static imp::KeyInner<T> } +pub struct ScopedKey<T:'static> { inner: fn() -> &'static imp::KeyInner<T> } /// Declare a new scoped thread local storage key. /// |
