diff options
| author | bors <bors@rust-lang.org> | 2018-09-07 12:48:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-07 12:48:20 +0000 |
| commit | 5a3292f163da3327523ddec5bc44d17c2378ec37 (patch) | |
| tree | f6cba61434ccd1e0c0d92ea41929faeeb00436cf /src/liballoc/sync.rs | |
| parent | 7366752a6164dd8e004f32c1a40f0e04a61bcbb2 (diff) | |
| parent | 87fbf544135d1ba8812c0589ba947394e53730a8 (diff) | |
| download | rust-5a3292f163da3327523ddec5bc44d17c2378ec37.tar.gz rust-5a3292f163da3327523ddec5bc44d17c2378ec37.zip | |
Auto merge of #54021 - kennytm:rollup, r=kennytm
Rollup of 17 pull requests
Successful merges:
- #53299 (Updated core/macros.rs to note it works in a no_std environment.)
- #53376 (Cross reference io::copy and fs::copy in docs.)
- #53455 (Individual docs for {from,to}_*_bytes)
- #53550 (librustc_lint: In recursion warning, change 'recurring' to 'recursing')
- #53860 (Migrate (some) of run-pass/ to ui)
- #53874 (Implement Unpin for Box, Rc, and Arc)
- #53895 (tidy: Cleanups and clippy warning fixes)
- #53946 (Clarify `ManuallyDrop` docs)
- #53948 (Minimized clippy test from when NLL disabled two-phase borrows)
- #53959 (Add .git extension to submodule paths missing it)
- #53966 (A few cleanups and minor improvements to mir/dataflow)
- #53967 (propagate build.python into cmake)
- #53979 (Remove `#[repr(transparent)]` from atomics)
- #53991 (Add unchecked_shl/shr check for intrinsics to fix miri's test suit)
- #53992 (migrate run-pass/borrowck to ui/run-pass)
- #53994 (migrate run-pass/*/ to ui/run-pass)
- #54023 (update clippy submodule)
Diffstat (limited to 'src/liballoc/sync.rs')
| -rw-r--r-- | src/liballoc/sync.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index db7a4044b26..ff45daef514 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -27,7 +27,7 @@ use core::mem::{self, align_of_val, size_of_val}; use core::ops::Deref; use core::ops::CoerceUnsized; use core::ptr::{self, NonNull}; -use core::marker::{Unsize, PhantomData}; +use core::marker::{Unpin, Unsize, PhantomData}; use core::hash::{Hash, Hasher}; use core::{isize, usize}; use core::convert::From; @@ -1943,3 +1943,6 @@ impl<T: ?Sized> AsRef<T> for Arc<T> { &**self } } + +#[unstable(feature = "pin", issue = "49150")] +impl<T: ?Sized> Unpin for Arc<T> { } |
