From 6e5c18e8dc94a679126d276884a3ad4b9a3e0934 Mon Sep 17 00:00:00 2001
From: tinaun <tinagma@gmail.com>
Date: Fri, 8 Jun 2018 16:45:27 -0400
Subject: add a few blanket future impls to std

---
 src/liballoc/boxed.rs | 39 +++++++++++++++++++++++++++++++++++++++
 src/liballoc/lib.rs   |  1 +
 2 files changed, 40 insertions(+)

(limited to 'src/liballoc')

diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index a64b94b6517..896d9dee3ee 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -914,6 +914,45 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<PinBox<U>> for PinBox<T> {}
 #[unstable(feature = "pin", issue = "49150")]
 impl<T: ?Sized> Unpin for PinBox<T> {}
 
+#[unstable(feature = "futures_api", issue = "50547")]
+impl<'a, F: ?Sized + Future + Unpin> Future for Box<F> {
+    type Output = F::Output;
+
+    fn poll(mut self: PinMut<Self>, cx: &mut Context) -> Poll<Self::Output> {
+        PinMut::new(&mut **self).poll(cx)
+    }
+}
+
+#[unstable(feature = "futures_api", issue = "50547")]
+impl<'a, F: ?Sized + Future> Future for PinBox<F> {
+    type Output = F::Output;
+
+    fn poll(mut self: PinMut<Self>, cx: &mut Context) -> Poll<Self::Output> {
+        self.as_pin_mut().poll(cx)
+    }
+}
+
+#[unstable(feature = "futures_api", issue = "50547")]
+unsafe impl<F: Future<Output = ()> + Send + 'static> UnsafePoll for Box<F> {
+    fn into_raw(self) -> *mut () {
+        unsafe {
+            mem::transmute(self)
+        }
+    }
+
+    unsafe fn poll(task: *mut (), cx: &mut Context) -> Poll<()> {
+        let ptr: *mut F = mem::transmute(task);
+        let pin: PinMut<F> = PinMut::new_unchecked(&mut *ptr);
+        pin.poll(cx)
+    }
+
+    unsafe fn drop(task: *mut ()) {
+        let ptr: *mut F = mem::transmute(task);
+        let boxed = Box::from_raw(ptr);
+        drop(boxed)
+    }
+}
+
 #[unstable(feature = "futures_api", issue = "50547")]
 unsafe impl<F: Future<Output = ()> + Send + 'static> UnsafePoll for PinBox<F> {
     fn into_raw(self) -> *mut () {
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 242c7d2e70f..a1139189c9a 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -80,6 +80,7 @@
 #![cfg_attr(test, feature(rand, test))]
 #![feature(allocator_api)]
 #![feature(allow_internal_unstable)]
+#![feature(arbitrary_self_types)]
 #![feature(ascii_ctype)]
 #![feature(box_into_raw_non_null)]
 #![feature(box_patterns)]
-- 
cgit 1.4.1-3-g733a5


From 49eb754cc0108d8546eae70cdcebf81aaddbece3 Mon Sep 17 00:00:00 2001
From: tinaun <tinagma@gmail.com>
Date: Fri, 8 Jun 2018 23:16:51 -0400
Subject: addressed nits

---
 src/liballoc/boxed.rs | 21 ---------------------
 src/libstd/panic.rs   |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'src/liballoc')

diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 896d9dee3ee..c794fb8220a 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -932,27 +932,6 @@ impl<'a, F: ?Sized + Future> Future for PinBox<F> {
     }
 }
 
-#[unstable(feature = "futures_api", issue = "50547")]
-unsafe impl<F: Future<Output = ()> + Send + 'static> UnsafePoll for Box<F> {
-    fn into_raw(self) -> *mut () {
-        unsafe {
-            mem::transmute(self)
-        }
-    }
-
-    unsafe fn poll(task: *mut (), cx: &mut Context) -> Poll<()> {
-        let ptr: *mut F = mem::transmute(task);
-        let pin: PinMut<F> = PinMut::new_unchecked(&mut *ptr);
-        pin.poll(cx)
-    }
-
-    unsafe fn drop(task: *mut ()) {
-        let ptr: *mut F = mem::transmute(task);
-        let boxed = Box::from_raw(ptr);
-        drop(boxed)
-    }
-}
-
 #[unstable(feature = "futures_api", issue = "50547")]
 unsafe impl<F: Future<Output = ()> + Send + 'static> UnsafePoll for PinBox<F> {
     fn into_raw(self) -> *mut () {
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index b70de73991f..8aee15b5eda 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -326,9 +326,9 @@ impl<'a, F: Future> Future for AssertUnwindSafe<F> {
         unsafe {
             let pinned_field = PinMut::new_unchecked(
                 &mut PinMut::get_mut(self.reborrow()).0
-            ); 
-
-            pinned_field.poll(cx) 
+            );
+            
+            pinned_field.poll(cx)
         }
     }
 }
-- 
cgit 1.4.1-3-g733a5