diff options
| author | bors <bors@rust-lang.org> | 2020-12-05 13:41:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-05 13:41:08 +0000 |
| commit | 9122b769c8306b1cb3c8d1f96fca3ea3e208e22e (patch) | |
| tree | 3dfc0d4f88f36d7fdfd210a4e0e5c6c7e480fb2e /library/alloc/src/collections | |
| parent | 551a2c6cbcf239f662a18233cf647bf67e5a74ed (diff) | |
| parent | 4fef39113a514bb270f5661a82fdba17d3e41dbb (diff) | |
| download | rust-9122b769c8306b1cb3c8d1f96fca3ea3e208e22e.tar.gz rust-9122b769c8306b1cb3c8d1f96fca3ea3e208e22e.zip | |
Auto merge of #78373 - matthewjasper:drop-on-into, r=pnkfelix
Don't leak return value after panic in drop Closes #47949
Diffstat (limited to 'library/alloc/src/collections')
| -rw-r--r-- | library/alloc/src/collections/btree/map/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/src/collections/btree/map/tests.rs b/library/alloc/src/collections/btree/map/tests.rs index 23cd4f3d83d..97df8ea07d2 100644 --- a/library/alloc/src/collections/btree/map/tests.rs +++ b/library/alloc/src/collections/btree/map/tests.rs @@ -1772,7 +1772,7 @@ fn test_append_drop_leak() { catch_unwind(move || left.append(&mut right)).unwrap_err(); - assert_eq!(DROPS.load(SeqCst), 4); // Rust issue #47949 ate one little piggy + assert_eq!(DROPS.load(SeqCst), 5); } #[test] |