diff options
| author | bors <bors@rust-lang.org> | 2018-08-27 22:56:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-27 22:56:15 +0000 |
| commit | 8c2b371ebc5b538a24e6589245ce524ba3e4ce18 (patch) | |
| tree | e9c467bbb78a1a28afed4a33c395a2dd2a613aff /src/libstd | |
| parent | f7202e40f49d2b29635f095a3270a7214e25ce8b (diff) | |
| parent | 83ca347343f5783779b908c264c9470634d3758c (diff) | |
| download | rust-8c2b371ebc5b538a24e6589245ce524ba3e4ce18.tar.gz rust-8c2b371ebc5b538a24e6589245ce524ba3e4ce18.zip | |
Auto merge of #53227 - nivkner:pin_move, r=RalfJung
move the Pin API into its own module for centralized documentation This implements the change proposed by @withoutboats in #49150, as suggested by @RalfJung in the review of #53104, along with the documentation that was originally in it, that was deemed more appropriate in module-level documentation. r? @RalfJung
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/macros.rs | 2 | ||||
| -rw-r--r-- | src/libstd/panic.rs | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index cadb5c0ba5d..d9657f691c7 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -12,7 +12,7 @@ use core::cell::Cell; use core::marker::Unpin; -use core::mem::PinMut; +use core::pin::PinMut; use core::option::Option; use core::ptr::NonNull; use core::task::{self, Poll}; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 87abf02b445..310475d31fd 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -435,6 +435,8 @@ pub use alloc_crate::borrow; pub use alloc_crate::fmt; #[stable(feature = "rust1", since = "1.0.0")] pub use alloc_crate::format; +#[unstable(feature = "pin", issue = "49150")] +pub use alloc_crate::pin; #[stable(feature = "rust1", since = "1.0.0")] pub use alloc_crate::slice; #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index f15494c5fd7..6945a41a5e7 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -230,7 +230,7 @@ macro_rules! await { loop { if let $crate::task::Poll::Ready(x) = $crate::future::poll_in_task_cx(unsafe { - $crate::mem::PinMut::new_unchecked(&mut pinned) + $crate::pin::PinMut::new_unchecked(&mut pinned) }) { break x; diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index b8c1c4f9e68..47547aedcbd 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -16,7 +16,7 @@ use any::Any; use cell::UnsafeCell; use fmt; use future::Future; -use mem::PinMut; +use pin::PinMut; use ops::{Deref, DerefMut}; use panicking; use ptr::{Unique, NonNull}; |
