Skip to content

Commit

Permalink
Auto merge of #127757 - workingjubilee:rollup-4dbks5r, r=workingjubilee
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Jul 15, 2024
2 parents e9f61f8 + 5202195 commit 58cd9d6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/fail/alloc/global_system_mixup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

#![feature(allocator_api, slice_ptr_get)]

Expand Down

0 comments on commit 58cd9d6

Please sign in to comment.