Skip to content

Commit 58cd9d6

Browse files
committed
Auto merge of #127757 - workingjubilee:rollup-4dbks5r, r=workingjubilee
Rollup of 3 pull requests Successful merges: - #127712 (Windows: Remove some unnecessary type aliases) - #127744 (std: `#![deny(unsafe_op_in_unsafe_fn)]` in platform-independent code) - #127750 (Make os/windows and pal/windows default to `#![deny(unsafe_op_in_unsafe_fn)]`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e9f61f8 + 5202195 commit 58cd9d6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/fail/alloc/global_system_mixup.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
//@normalize-stderr-test: "using [A-Za-z]+ heap deallocation operation" -> "using PLATFORM heap deallocation operation"
66
//@normalize-stderr-test: "\| +\^+" -> "| ^"
7-
//@normalize-stderr-test: "libc::free\([^()]*\)|unsafe \{ HeapFree\([^()]*\) \};" -> "FREE();"
7+
//@normalize-stderr-test: "libc::free\([^()]*\)|unsafe \{ HeapFree\([^}]*\};" -> "FREE();"
88

99
#![feature(allocator_api, slice_ptr_get)]
1010

0 commit comments

Comments
 (0)