about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTaylor Cramer <cramertj@google.com>2018-05-22 17:09:49 -0700
committerTaylor Cramer <cramertj@google.com>2018-05-22 17:24:49 -0700
commita44abfdc29ee66ec1d51c2389405cbac479f35a7 (patch)
tree06e2d72787ce75e6ac65fd5c30dcfe97fef9e91d
parentd034ae53c43352b06341455fb1394cb5d4069999 (diff)
downloadrust-a44abfdc29ee66ec1d51c2389405cbac479f35a7.tar.gz
rust-a44abfdc29ee66ec1d51c2389405cbac479f35a7.zip
Make `Unpin` safe to implement
-rw-r--r--src/liballoc/boxed.rs2
-rw-r--r--src/libcore/marker.rs2
-rw-r--r--src/libcore/mem.rs2
3 files changed, 3 insertions, 3 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> {}
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index 6c8ee0eda11..d4a87b13f04 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -605,7 +605,7 @@ unsafe impl<'a, T: ?Sized> Freeze for &'a mut T {}
 ///
 /// [`PinMut`]: ../mem/struct.PinMut.html
 #[unstable(feature = "pin", issue = "49150")]
-pub unsafe auto trait Unpin {}
+pub auto trait Unpin {}
 
 /// Implementations of `Copy` for primitive types.
 ///
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
index 20445def634..116e56f4ae9 100644
--- a/src/libcore/mem.rs
+++ b/src/libcore/mem.rs
@@ -1207,4 +1207,4 @@ impl<'a, T: ?Sized> fmt::Pointer for PinMut<'a, T> {
 impl<'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<PinMut<'a, U>> for PinMut<'a, T> {}
 
 #[unstable(feature = "pin", issue = "49150")]
-unsafe impl<'a, T: ?Sized> Unpin for PinMut<'a, T> {}
+impl<'a, T: ?Sized> Unpin for PinMut<'a, T> {}