Rollup merge of #98491 - antoyo:fix/ui-test-backtrace-panic-abort, r=Dylan-DPC

JohnTitor · web-flow · commit b1d66d810d95 · 2022-06-26T13:15:00.000+09:00
Fix backtrace UI test when panic=abort is used

The function `contains_verbose_expected` is only used when the panic strategy is not abort, so it caused a warning when it was abort, which made the UI test failed on stderr comparison.
diff --git a/src/test/ui/backtrace.rs b/src/test/ui/backtrace.rs
@@ -44,6 +44,7 @@ fn expected(fn_name: &str) -> String {
     format!(" backtrace::{}", fn_name)
 }
 
+#[cfg(not(panic = "abort"))]
 fn contains_verbose_expected(s: &str, fn_name: &str) -> bool {
     // HACK(eddyb) work around the fact that verbosely demangled stack traces
     // (from `RUST_BACKTRACE=full`, or, as is the case here, panic-in-panic)

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ fn expected(fn_name: &str) -> String {`
`44`	`44`	`format!(" backtrace::{}", fn_name)`
`45`	`45`	`}`
`46`	`46`
	`47`	`+#[cfg(not(panic = "abort"))]`
`47`	`48`	`fn contains_verbose_expected(s: &str, fn_name: &str) -> bool {`
`48`	`49`	`// HACK(eddyb) work around the fact that verbosely demangled stack traces`
`49`	`50`	// (from `RUST_BACKTRACE=full`, or, as is the case here, panic-in-panic)