Skip to content

Commit bfed149

Browse files
committedAug 22, 2018
reexport Unpin into pin module
1 parent 871e89b commit bfed149

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed
 

‎src/liballoc/pin.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@
9696
#![unstable(feature = "pin", issue = "49150")]
9797

9898
pub use core::pin::*;
99+
pub use core::marker::Unpin;
99100

100101
use core::convert::From;
101102
use core::fmt;
102103
use core::future::{Future, FutureObj, LocalFutureObj, UnsafeFutureObj};
103-
use core::marker::{Unpin, Unsize};
104+
use core::marker::Unsize;
104105
use core::ops::{CoerceUnsized, Deref, DerefMut};
105106
use core::task::{Context, Poll};
106107

‎src/libcore/marker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ unsafe impl<'a, T: ?Sized> Freeze for &'a mut T {}
630630
///
631631
/// This trait is automatically implemented for almost every type.
632632
///
633-
/// [`replace`]: ../mem/fn.replace.html
633+
/// [`replace`]: ../../core/mem/fn.replace.html
634634
/// [`PinMut`]: ../pin/struct.PinMut.html
635635
#[unstable(feature = "pin", issue = "49150")]
636636
pub auto trait Unpin {}

0 commit comments

Comments
 (0)
Please sign in to comment.