diff options
| author | bors <bors@rust-lang.org> | 2019-07-03 07:58:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-03 07:58:29 +0000 |
| commit | a53f9df32fbb0b5f4382caaad8f1a46f36ea887c (patch) | |
| tree | 144e6561384fe5b1b97b234677ed9de269daee1c /src/libstd/collections/hash | |
| parent | 9d98f8f319eaa1a40f76fb15b52ee2a179e5286a (diff) | |
| parent | 3e9fc8c46a64280ee0d6f3423e26e633c85f490f (diff) | |
| download | rust-1.36.0.tar.gz rust-1.36.0.zip | |
Auto merge of #62311 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.36.0
[stable] Emergency stable backports
Diffstat (limited to 'src/libstd/collections/hash')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 5a2fe2b244f..2925d8362c8 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -2608,6 +2608,12 @@ mod test_map { use realstd::collections::CollectionAllocErr::*; use realstd::usize; + // https://github.com/rust-lang/rust/issues/62301 + fn _assert_hashmap_is_unwind_safe() { + fn assert_unwind_safe<T: crate::panic::UnwindSafe>() {} + assert_unwind_safe::<HashMap<(), crate::cell::UnsafeCell<()>>>(); + } + #[test] fn test_zero_capacities() { type HM = HashMap<i32, i32>; |