diff options
| author | bors <bors@rust-lang.org> | 2024-07-15 10:57:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-15 10:57:49 +0000 |
| commit | d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee (patch) | |
| tree | bd23bcd2ad1cdb90b447fb16e6a4679dbda900d0 /src | |
| parent | adeb79d3f523dfc11a8e9db64ddfc5f546f650bb (diff) | |
| parent | 476d399782a27df846e1ace578a2e89f70a13d42 (diff) | |
| download | rust-d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee.tar.gz rust-d3dd34a1d4a7e25a92a0d65994bb01a5d17c59ee.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/tests/fail/alloc/global_system_mixup.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/tests/fail/alloc/global_system_mixup.rs b/src/tools/miri/tests/fail/alloc/global_system_mixup.rs index 2e88e5644e4..19c62913b4c 100644 --- a/src/tools/miri/tests/fail/alloc/global_system_mixup.rs +++ b/src/tools/miri/tests/fail/alloc/global_system_mixup.rs @@ -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)] |