rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fallout: extend thread with phantomdata for 'a lifetime

Browse Source
This commit is contained in:
Niko Matsakis
2015-02-12 12:44:06 -05:00
parent 62b517772a
commit 1ed5842829
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstd/thread.rs
View File

@@ -153,7 +153,7 @@ use any::Any;
use cell::UnsafeCell; use cell::UnsafeCell;
use fmt; use fmt;
use io; use io;
use marker; use marker::{PhantomData, Send, Sync};
use old_io::stdio; use old_io::stdio;
use rt::{self, unwind}; use rt::{self, unwind};
use sync::{Mutex, Condvar, Arc}; use sync::{Mutex, Condvar, Arc};
@@ -260,7 +260,7 @@ impl Builder {
T: Send + 'a, F: FnOnce() -> T, F: Send + 'a T: Send + 'a, F: FnOnce() -> T, F: Send + 'a
{ {
self.spawn_inner(Thunk::new(f)).map(|inner| { 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")] #[stable(feature = "rust1", since = "1.0.0")]
pub struct JoinGuard<'a, T: 'a> { pub struct JoinGuard<'a, T: 'a> {
inner: JoinInner<T>, inner: JoinInner<T>,
_marker: marker::CovariantType<&'a T>, _marker: PhantomData<&'a T>,
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]