mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-14 02:49:40 +00:00
Add missing marker to std:🧵:JoinGuard.
The lifetime was previously, incorrectly unconstrained.
This commit is contained in:
parent
22c88323f3
commit
adfcd93f0c
@ -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")]
|
||||
|
Loading…
Reference in New Issue
Block a user