Auto merge of rust-lang#78373 - matthewjasper:drop-on-into, r=pnkfelix

bors · bors · commit a266bd4c01fe · 2020-12-05T13:41:08.000Z
Don't leak return value after panic in drop Closes rust-lang#47949
diff --git a/alloc/src/collections/btree/map/tests.rs b/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]

Original file line number	Diff line number	Diff line change
`@@ -1772,7 +1772,7 @@ fn test_append_drop_leak() {`
`1772`	`1772`
`1773`	`1773`	`catch_unwind(move \|\| left.append(&mut right)).unwrap_err();`
`1774`	`1774`
`1775`		`- assert_eq!(DROPS.load(SeqCst), 4); // Rust issue #47949 ate one little piggy`
	`1775`	`+ assert_eq!(DROPS.load(SeqCst), 5);`
`1776`	`1776`	`}`
`1777`	`1777`
`1778`	`1778`	`#[test]`