Auto merge of rust-lang#81257 - pnkfelix:issue-80949-short-term-resolution-via-revert-of-pr-78373, r=matthewjasper

bors · bors · commit fbdc5fbbad58 · 2021-02-05T14:52:57.000Z
Revert 78373 ("dont leak return value after panic in drop") Short term resolution for issue rust-lang#80949. Reopen rust-lang#47949 after this lands. (We plan to fine-tune PR rust-lang#78373 to not run into this problem.)
diff --git a/alloc/src/collections/btree/map/tests.rs b/alloc/src/collections/btree/map/tests.rs
@@ -1882,7 +1882,7 @@ fn test_append_drop_leak() {
 
     catch_unwind(move || left.append(&mut right)).unwrap_err();
 
-    assert_eq!(DROPS.load(SeqCst), 5);
+    assert_eq!(DROPS.load(SeqCst), 4); // Rust issue #47949 ate one little piggy
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -1882,7 +1882,7 @@ fn test_append_drop_leak() {`
`1882`	`1882`
`1883`	`1883`	`catch_unwind(move \|\| left.append(&mut right)).unwrap_err();`
`1884`	`1884`
`1885`		`- assert_eq!(DROPS.load(SeqCst), 5);`
	`1885`	`+ assert_eq!(DROPS.load(SeqCst), 4); // Rust issue #47949 ate one little piggy`
`1886`	`1886`	`}`
`1887`	`1887`
`1888`	`1888`	`#[test]`