about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-31 01:58:51 +0000
committerbors <bors@rust-lang.org>2015-10-31 01:58:51 +0000
commitee88e04e77f34ecf9cd085a2073c044feb0ddda3 (patch)
tree77517272cd2111332192caca017d39ec4b7d547b /src/libcore
parent11ba81e105d7a0300a7af5731d644c451f191135 (diff)
parent04266daf779c960f9037afe1eafc0acd68d85b84 (diff)
downloadrust-ee88e04e77f34ecf9cd085a2073c044feb0ddda3.tar.gz
rust-ee88e04e77f34ecf9cd085a2073c044feb0ddda3.zip
Auto merge of #29480 - apasel422:coerce-unique, r=alexcrichton
Closes rust-lang/rfcs#1343.
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/ptr.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 54cd3d0c867..86292ce9703 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -534,6 +534,10 @@ impl<T: ?Sized> Unique<T> {
     }
 }
 
+#[cfg(not(stage0))] // remove cfg after new snapshot
+#[unstable(feature = "unique", issue = "27730")]
+impl<T: ?Sized, U: ?Sized> CoerceUnsized<Unique<U>> for Unique<T> where T: Unsize<U> { }
+
 #[unstable(feature = "unique", issue= "27730")]
 impl<T:?Sized> Deref for Unique<T> {
     type Target = *mut T;