diff options
| author | tinaun <tinagma@gmail.com> | 2018-06-08 23:16:51 -0400 |
|---|---|---|
| committer | tinaun <tinagma@gmail.com> | 2018-06-08 23:16:51 -0400 |
| commit | 49eb754cc0108d8546eae70cdcebf81aaddbece3 (patch) | |
| tree | 9d88e5251bf6de92e7dfb800b5c7e1218e4f837e /src | |
| parent | 6e5c18e8dc94a679126d276884a3ad4b9a3e0934 (diff) | |
| download | rust-49eb754cc0108d8546eae70cdcebf81aaddbece3.tar.gz rust-49eb754cc0108d8546eae70cdcebf81aaddbece3.zip | |
addressed nits
Diffstat (limited to 'src')
| -rw-r--r-- | src/liballoc/boxed.rs | 21 | ||||
| -rw-r--r-- | src/libstd/panic.rs | 6 |
2 files changed, 3 insertions, 24 deletions
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 @@ -933,27 +933,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 () { PinBox::into_raw(self) as *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) } } } |
