about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2017-02-25 14:13:31 +0200
committerGitHub <noreply@github.com>2017-02-25 14:13:31 +0200
commit3ece892490794709c3fd0ff0ced35440d01f5708 (patch)
tree1b4af24e261b07a28cf16326df3f1010e268d7e1 /src/libstd
parent411d8e95dbbe8d7de1ea9ca6b95abf95f8c49e38 (diff)
parent347e1af66b4b705594c3f668460f252af4e87146 (diff)
downloadrust-3ece892490794709c3fd0ff0ced35440d01f5708.tar.gz
rust-3ece892490794709c3fd0ff0ced35440d01f5708.zip
Rollup merge of #40020 - alexcrichton:fix-unwind-safe, r=sfackler
std: Relax UnwindSafe impl for Unique

Add the `?Sized` bound as we don't require the type to be sized.

Closes #40011
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/panic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index ac0d0d2afb8..f99634ecac2 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -198,7 +198,7 @@ impl<T: RefUnwindSafe + ?Sized> UnwindSafe for *const T {}
 #[stable(feature = "catch_unwind", since = "1.9.0")]
 impl<T: RefUnwindSafe + ?Sized> UnwindSafe for *mut T {}
 #[unstable(feature = "unique", issue = "27730")]
-impl<T: UnwindSafe> UnwindSafe for Unique<T> {}
+impl<T: UnwindSafe + ?Sized> UnwindSafe for Unique<T> {}
 #[unstable(feature = "shared", issue = "27730")]
 impl<T: RefUnwindSafe + ?Sized> UnwindSafe for Shared<T> {}
 #[stable(feature = "catch_unwind", since = "1.9.0")]