Skip to content

Commit 0330724

Browse files
committed
Auto merge of #111960 - compiler-errors:rollup-onka2dl, r=compiler-errors
Rollup of 7 pull requests Successful merges: - #107522 (Add Median of Medians fallback to introselect) - #111152 (update `pulldown-cmark` to `0.9.3`) - #111757 (Consider lint check attributes on match arms) - #111831 (Always capture slice when pattern requires checking the length) - #111929 (Don't print newlines in APITs) - #111945 (Migrate GUI colors test to original CSS color format) - #111950 (Remove ExpnKind::Inlined.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 57cea6c + 0c07f65 commit 0330724

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

tests/fail/terminate-terminator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ impl Drop for Foo {
1212

1313
#[inline(always)]
1414
fn has_cleanup() {
15+
//~^ ERROR: panic in a function that cannot unwind
1516
let _f = Foo;
1617
panic!();
1718
}
1819

1920
extern "C" fn panic_abort() {
2021
has_cleanup();
21-
//~^ ERROR: panic in a function that cannot unwind
2222
}
2323

2424
fn main() {

tests/fail/terminate-terminator.stderr

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ error: abnormal termination: panic in a function that cannot unwind
66
--> $DIR/terminate-terminator.rs:LL:CC
77
|
88
LL | / fn has_cleanup() {
9+
LL | |
910
LL | | let _f = Foo;
1011
LL | | panic!();
1112
LL | | }
1213
| |_^ panic in a function that cannot unwind
13-
...
14-
LL | has_cleanup();
15-
| ------------- in this inlined function call
1614
|
17-
= note: inside `panic_abort` at $DIR/terminate-terminator.rs:LL:CC
15+
= note: inside `has_cleanup` at $DIR/terminate-terminator.rs:LL:CC
16+
note: inside `panic_abort`
17+
--> $DIR/terminate-terminator.rs:LL:CC
18+
|
19+
LL | has_cleanup();
20+
| ^^^^^^^^^^^^^
1821
note: inside `main`
1922
--> $DIR/terminate-terminator.rs:LL:CC
2023
|

0 commit comments

Comments
 (0)