about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-24 20:58:12 +0000
committerbors <bors@rust-lang.org>2018-05-24 20:58:12 +0000
commitc2d46037fa6617408155dcba6251d7c4e123b4f5 (patch)
tree6e77f0ba80651beec17a80dfe7ca33923056e949 /src/liballoc
parent07465222ca9454d7c274908424a5e084710efd7e (diff)
parent15d2f965d83672dc8e7edc972ab256e587878332 (diff)
downloadrust-c2d46037fa6617408155dcba6251d7c4e123b4f5.tar.gz
rust-c2d46037fa6617408155dcba6251d7c4e123b4f5.zip
Auto merge of #50984 - cramertj:unpin-changes, r=aturon
Unpin changes

r? @aturon

cc @withoutboats, @RalfJung, @pythonesque, #49150
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/boxed.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index a1567344235..a83ce7f379f 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -850,4 +850,4 @@ impl<T: ?Sized> fmt::Pointer for PinBox<T> {
 impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<PinBox<U>> for PinBox<T> {}
 
 #[unstable(feature = "pin", issue = "49150")]
-unsafe impl<T: ?Sized> Unpin for PinBox<T> {}
+impl<T: ?Sized> Unpin for PinBox<T> {}