diff options
| author | bors <bors@rust-lang.org> | 2018-02-07 17:51:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-07 17:51:52 +0000 |
| commit | 29c8276cee4a0eab7e0634ff25c6b47bd9f87c6c (patch) | |
| tree | aabb7278f081c3c90cea9e0337779739805408a9 /src/libstd | |
| parent | fee39ba8bd98f5b93c60de51336830fa7f0b9d97 (diff) | |
| parent | 732c83007c9069c6dd33a5dc98e62337dca014bd (diff) | |
| download | rust-29c8276cee4a0eab7e0634ff25c6b47bd9f87c6c.tar.gz rust-29c8276cee4a0eab7e0634ff25c6b47bd9f87c6c.zip | |
Auto merge of #48053 - Manishearth:rollup, r=Manishearth
Rollup of 10 pull requests - Successful merges: #47613, #47631, #47810, #47883, #47922, #47944, #48014, #48018, #48020, #48028 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/panic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 560876006d3..112e1106093 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -198,7 +198,7 @@ impl<T: RefUnwindSafe + ?Sized> UnwindSafe for *const T {} impl<T: RefUnwindSafe + ?Sized> UnwindSafe for *mut T {} #[unstable(feature = "ptr_internals", issue = "0")] impl<T: UnwindSafe + ?Sized> UnwindSafe for Unique<T> {} -#[stable(feature = "nonnull", since = "1.24.0")] +#[stable(feature = "nonnull", since = "1.25.0")] impl<T: RefUnwindSafe + ?Sized> UnwindSafe for NonNull<T> {} #[stable(feature = "catch_unwind", since = "1.9.0")] impl<T: ?Sized> UnwindSafe for Mutex<T> {} |