From bfed149020cc48260056c8621d93a7931fba6bde Mon Sep 17 00:00:00 2001
From: Niv Kaminer <nivkner@zoho.com>
Date: Tue, 21 Aug 2018 15:24:14 +0300
Subject: [PATCH] reexport Unpin into pin module

---
 src/liballoc/pin.rs   | 3 ++-
 src/libcore/marker.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/liballoc/pin.rs b/src/liballoc/pin.rs
index a1abaf74b26..a5bc4c75bd5 100644
--- a/src/liballoc/pin.rs
+++ b/src/liballoc/pin.rs
@@ -96,11 +96,12 @@
 #![unstable(feature = "pin", issue = "49150")]
 
 pub use core::pin::*;
+pub use core::marker::Unpin;
 
 use core::convert::From;
 use core::fmt;
 use core::future::{Future, FutureObj, LocalFutureObj, UnsafeFutureObj};
-use core::marker::{Unpin, Unsize};
+use core::marker::Unsize;
 use core::ops::{CoerceUnsized, Deref, DerefMut};
 use core::task::{Context, Poll};
 
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index 8e674c0bb7f..11f4821a925 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -630,7 +630,7 @@ unsafe impl<'a, T: ?Sized> Freeze for &'a mut T {}
 ///
 /// This trait is automatically implemented for almost every type.
 ///
-/// [`replace`]: ../mem/fn.replace.html
+/// [`replace`]: ../../core/mem/fn.replace.html
 /// [`PinMut`]: ../pin/struct.PinMut.html
 #[unstable(feature = "pin", issue = "49150")]
 pub auto trait Unpin {}