Skip to content

Commit 734999a

Browse files
committed
Auto merge of #137143 - matthiaskrgr:rollup-9hapmyd, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #136986 (Apply unsafe_op_in_unsafe_fn to the standard library) - #137012 (add docs and ut for bootstrap util cc-detect) - #137072 (Load all builtin targets at once instead of one by one in check-cfg) - #137102 (Rework `name_regions` to not rely on reverse scc graph for non-member-constrain usages) - #137112 (Don't project into `NonNull` when dropping a `Box`) - #137114 (Add an example for `std::error::Error`) - #137117 (Fix test that relies on error language) - #137119 (fix broken `x {doc, build} core`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 69b4cac + 9fb671e commit 734999a

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tests/fail/panic/panic_abort1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@error-in-other-file: the program aborted execution
22
//@normalize-stderr-test: "\| +\^+" -> "| ^"
3-
//@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
3+
//@normalize-stderr-test: "unsafe \{ libc::abort\(\); \}|core::intrinsics::abort\(\);" -> "ABORT();"
44
//@compile-flags: -C panic=abort
55

66
fn main() {

tests/fail/panic/panic_abort2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@error-in-other-file: the program aborted execution
22
//@normalize-stderr-test: "\| +\^+" -> "| ^"
3-
//@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
3+
//@normalize-stderr-test: "unsafe \{ libc::abort\(\); \}|core::intrinsics::abort\(\);" -> "ABORT();"
44
//@compile-flags: -C panic=abort
55

66
fn main() {

tests/fail/panic/panic_abort3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@error-in-other-file: the program aborted execution
22
//@normalize-stderr-test: "\| +\^+" -> "| ^"
3-
//@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
3+
//@normalize-stderr-test: "unsafe \{ libc::abort\(\); \}|core::intrinsics::abort\(\);" -> "ABORT();"
44
//@compile-flags: -C panic=abort
55

66
fn main() {

tests/fail/panic/panic_abort4.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@error-in-other-file: the program aborted execution
22
//@normalize-stderr-test: "\| +\^+" -> "| ^"
3-
//@normalize-stderr-test: "libc::abort\(\);|core::intrinsics::abort\(\);" -> "ABORT();"
3+
//@normalize-stderr-test: "unsafe \{ libc::abort\(\); \}|core::intrinsics::abort\(\);" -> "ABORT();"
44
//@compile-flags: -C panic=abort
55

66
fn main() {

0 commit comments

Comments
 (0)