diff options
| author | bors <bors@rust-lang.org> | 2018-07-28 09:40:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-28 09:40:05 +0000 |
| commit | cc224282de8de427005103e5c0504cbdf1148694 (patch) | |
| tree | 9061d4e1ab49458fe2ab7c56c3e94ba8d650b6f9 /src/libstd | |
| parent | 05607476521732c5c71bc063c8be5056aa573b15 (diff) | |
| parent | 59f8422a17c136582aeecf0c975deb6896df3595 (diff) | |
| download | rust-cc224282de8de427005103e5c0504cbdf1148694.tar.gz rust-cc224282de8de427005103e5c0504cbdf1148694.zip | |
Auto merge of #52802 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests Successful merges: - #52702 (Suggest fix when encountering different mutability from impl to trait) - #52703 (Improve a few vectors - calculate capacity or build from iterators) - #52740 (Suggest underscore when using dashes in crate namet push fork) - #52759 (Impl Send & Sync for JoinHandle) - #52760 (rustc_metadata: test loading atoi instead of cos) - #52763 (Omit the vendor component in Fuchsia triple) - #52765 (Remove unused "-Zenable_nonzeroing_move_hints" flag) - #52769 (Incorporate a stray test) - #52777 (Fix doc comment for 'ptr::copy_to' method) - #52779 (revert accidental atty downgrade) - #52781 (Use a slice where a vector is not necessary) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/thread/mod.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index f7052e4834a..ae804ad409e 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -1276,6 +1276,11 @@ impl<T> JoinInner<T> { #[stable(feature = "rust1", since = "1.0.0")] pub struct JoinHandle<T>(JoinInner<T>); +#[stable(feature = "joinhandle_impl_send_sync", since = "1.29.0")] +unsafe impl<T> Send for JoinHandle<T> {} +#[stable(feature = "joinhandle_impl_send_sync", since = "1.29.0")] +unsafe impl<T> Sync for JoinHandle<T> {} + impl<T> JoinHandle<T> { /// Extracts a handle to the underlying thread. /// |