diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-02-12 12:44:06 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-02-18 10:26:49 -0500 |
| commit | 1ed58428297611f60a6b5c7cf7024a4cd25b672c (patch) | |
| tree | d416449d31b5d4af497df61a0cbf60866c72b77b | |
| parent | 62b517772a11e2ff5accffd03e1832535f9bdc1d (diff) | |
| download | rust-1ed58428297611f60a6b5c7cf7024a4cd25b672c.tar.gz rust-1ed58428297611f60a6b5c7cf7024a4cd25b672c.zip | |
Fallout: extend thread with phantomdata for `'a` lifetime
| -rw-r--r-- | src/libstd/thread.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 3137d779c40..2d825a0f455 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -153,7 +153,7 @@ use any::Any; use cell::UnsafeCell; use fmt; use io; -use marker; +use marker::{PhantomData, Send, Sync}; use old_io::stdio; use rt::{self, unwind}; use sync::{Mutex, Condvar, Arc}; @@ -260,7 +260,7 @@ impl Builder { T: Send + 'a, F: FnOnce() -> T, F: Send + 'a { self.spawn_inner(Thunk::new(f)).map(|inner| { - JoinGuard { inner: inner, _marker: marker::CovariantType } + JoinGuard { inner: inner, _marker: PhantomData } }) } @@ -642,7 +642,7 @@ impl Drop for JoinHandle { #[stable(feature = "rust1", since = "1.0.0")] pub struct JoinGuard<'a, T: 'a> { inner: JoinInner<T>, - _marker: marker::CovariantType<&'a T>, + _marker: PhantomData<&'a T>, } #[stable(feature = "rust1", since = "1.0.0")] |
