diff options
| author | bors <bors@rust-lang.org> | 2016-10-04 04:15:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 04:15:20 -0700 |
| commit | 4a9af010ebc728bc4798b1ba30de0322c1f0138a (patch) | |
| tree | 3bff48d27899b511dc1a9c7993de557cb06b887b /src/libstd/panic.rs | |
| parent | 5ea241b9fb411b42f0173113d43ef1020ca3df70 (diff) | |
| parent | 177aabdfe3c47412d8d29d9d726640a5134a6b7d (diff) | |
| download | rust-4a9af010ebc728bc4798b1ba30de0322c1f0138a.tar.gz rust-4a9af010ebc728bc4798b1ba30de0322c1f0138a.zip | |
Auto merge of #36953 - Manishearth:rollup, r=Manishearth
Rollup of 12 pull requests - Successful merges: #36798, #36878, #36902, #36903, #36908, #36916, #36917, #36921, #36928, #36938, #36941, #36951 - Failed merges:
Diffstat (limited to 'src/libstd/panic.rs')
| -rw-r--r-- | src/libstd/panic.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 47f594a9b0c..3788568a2fd 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -196,9 +196,9 @@ impl<'a, T: RefUnwindSafe + ?Sized> UnwindSafe for &'a T {} impl<T: RefUnwindSafe + ?Sized> UnwindSafe for *const T {} #[stable(feature = "catch_unwind", since = "1.9.0")] impl<T: RefUnwindSafe + ?Sized> UnwindSafe for *mut T {} -#[stable(feature = "catch_unwind", since = "1.9.0")] +#[unstable(feature = "unique", issue = "27730")] impl<T: UnwindSafe> UnwindSafe for Unique<T> {} -#[stable(feature = "catch_unwind", since = "1.9.0")] +#[unstable(feature = "shared", issue = "27730")] impl<T: RefUnwindSafe + ?Sized> UnwindSafe for Shared<T> {} #[stable(feature = "catch_unwind", since = "1.9.0")] impl<T: ?Sized> UnwindSafe for Mutex<T> {} |