Auto merge of #53033 - RalfJung:manually_dro, r=SimonSapin

bors · bors · commit 5bb923988f94 · 2018-08-14T08:32:59.000Z
unsized ManuallyDrop I think this matches what @eddyb had in #52711 originally. ~~However, I have never added a `CoerceUnsized` before so I am not sure if I did this right. I copied the `unstable` attribute on the `impl` from elsewhere, but AFAIK it is useless because `impl`'s are insta-stable... so shouldn't this rather say "stable since 1.30"?~~ This is insta-stable and hence requires FCP, at least. Fixes #47034
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs
@@ -956,7 +956,8 @@ pub fn discriminant<T>(v: &T) -> Discriminant<T> {
 #[stable(feature = "manually_drop", since = "1.20.0")]
 #[lang = "manually_drop"]
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ManuallyDrop<T> {
+#[repr(transparent)]
+pub struct ManuallyDrop<T: ?Sized> {
     value: T,
 }
 
@@ -990,7 +991,9 @@ impl<T> ManuallyDrop<T> {
     pub fn into_inner(slot: ManuallyDrop<T>) -> T {
         slot.value
     }
+}
 
+impl<T: ?Sized> ManuallyDrop<T> {
     /// Manually drops the contained value.
     ///
     /// # Safety
@@ -1006,7 +1009,7 @@ impl<T> ManuallyDrop<T> {
 }
 
 #[stable(feature = "manually_drop", since = "1.20.0")]
-impl<T> Deref for ManuallyDrop<T> {
+impl<T: ?Sized> Deref for ManuallyDrop<T> {
     type Target = T;
     #[inline]
     fn deref(&self) -> &Self::Target {
@@ -1015,7 +1018,7 @@ impl<T> Deref for ManuallyDrop<T> {
 }
 
 #[stable(feature = "manually_drop", since = "1.20.0")]
-impl<T> DerefMut for ManuallyDrop<T> {
+impl<T: ?Sized> DerefMut for ManuallyDrop<T> {
     #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.value
diff --git a/src/libcore/tests/manually_drop.rs b/src/libcore/tests/manually_drop.rs
@@ -21,4 +21,9 @@ fn smoke() {
 
     let x = ManuallyDrop::new(TypeWithDrop);
     drop(x);
+
+    // also test unsizing
+    let x : Box<ManuallyDrop<[TypeWithDrop]>> =
+        Box::new(ManuallyDrop::new([TypeWithDrop, TypeWithDrop]));
+    drop(x);
 }

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,9 @@ fn smoke() {`
`21`	`21`
`22`	`22`	`let x = ManuallyDrop::new(TypeWithDrop);`
`23`	`23`	`drop(x);`
	`24`	`+`
	`25`	`+ // also test unsizing`
	`26`	`+ let x : Box<ManuallyDrop<[TypeWithDrop]>> =`
	`27`	`+ Box::new(ManuallyDrop::new([TypeWithDrop, TypeWithDrop]));`
	`28`	`+ drop(x);`
`24`	`29`	`}`