diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2015-02-17 23:09:14 +1100 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2015-02-18 08:19:22 +1100 |
| commit | adfcd93f0c3b624399934558f63d945b7b6b663a (patch) | |
| tree | 7e7b53a60f45e5386faaa22a53f07272a1621c6c /src/libstd | |
| parent | 22c88323f3175340b8f837fdbb9e78fd742da024 (diff) | |
| download | rust-adfcd93f0c3b624399934558f63d945b7b6b663a.tar.gz rust-adfcd93f0c3b624399934558f63d945b7b6b663a.zip | |
Add missing marker to std::thread::JoinGuard.
The lifetime was previously, incorrectly unconstrained.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/thread.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 3b758c83980..c662a1dafa1 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -151,7 +151,7 @@ use any::Any; use boxed::Box; use cell::UnsafeCell; use clone::Clone; -use marker::{Send, Sync}; +use marker::{Send, Sync, CovariantType}; use ops::{Drop, FnOnce}; use option::Option::{self, Some, None}; use result::Result::{Err, Ok}; @@ -255,6 +255,7 @@ impl Builder { joined: false, packet: my_packet, thread: thread, + _marker: CovariantType, } } @@ -487,6 +488,7 @@ pub struct JoinGuard<'a, T: 'a> { thread: Thread, joined: bool, packet: Packet<T>, + _marker: CovariantType<&'a T>, } #[stable(feature = "rust1", since = "1.0.0")] |
