Implement `UnsafeFutureObj` for `&mut Future`

3 files changed, 21 insertions, 3 deletions

diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 7f6d27088b7..fabeaa1c144 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -933,7 +933,9 @@ impl<F: ?Sized + Future> Future for PinBox<F> {
 }
 
 #[unstable(feature = "futures_api", issue = "50547")]
-unsafe impl<'a, T, F: Future<Output = T> + 'a> UnsafeFutureObj<'a, T> for PinBox<F> {
+unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for PinBox<F>
+    where F: Future<Output = T> + 'a
+{
     fn into_raw(self) -> *mut () {
         PinBox::into_raw(self) as *mut ()
     }
diff --git a/src/libcore/future/future_obj.rs b/src/libcore/future/future_obj.rs
index 99f21272538..98c504a3f7b 100644
--- a/src/libcore/future/future_obj.rs
+++ b/src/libcore/future/future_obj.rs
@@ -14,7 +14,7 @@
 
 use fmt;
 use future::Future;
-use marker::PhantomData;
+use marker::{PhantomData, Unpin};
 use mem::PinMut;
 use task::{Context, Poll};
 
@@ -163,3 +163,17 @@ pub unsafe trait UnsafeFutureObj<'a, T>: 'a {
     /// other calls to `drop` or `poll`.
     unsafe fn drop(ptr: *mut ());
 }
+
+unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for &'a mut F
+    where F: Future<Output = T> + Unpin + 'a
+{
+    fn into_raw(self) -> *mut () {
+        self as *mut F as *mut ()
+    }
+
+    unsafe fn poll(ptr: *mut (), cx: &mut Context) -> Poll<T> {
+        PinMut::new_unchecked(&mut *(ptr as *mut F)).poll(cx)
+    }
+
+    unsafe fn drop(_ptr: *mut ()) {}
+}
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
index b83c2e21a1a..84173654655 100644
--- a/src/libcore/mem.rs
+++ b/src/libcore/mem.rs
@@ -1231,7 +1231,9 @@ impl<'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<PinMut<'a, U>> for PinM
 impl<'a, T: ?Sized> Unpin for PinMut<'a, T> {}
 
 #[unstable(feature = "futures_api", issue = "50547")]
-unsafe impl<'a, T, F: Future<Output = T> + 'a> UnsafeFutureObj<'a, T> for PinMut<'a, F> {
+unsafe impl<'a, T, F> UnsafeFutureObj<'a, T> for PinMut<'a, F>
+    where F: Future<Output = T> + 'a
+{
     fn into_raw(self) -> *mut () {
         unsafe { PinMut::get_mut_unchecked(self) as *mut F as *mut () }
     }