diff options
| author | bors <bors@rust-lang.org> | 2024-08-27 13:51:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-27 13:51:39 +0000 |
| commit | 600edc948ab5de7a92538bcc2f49cb8d47925e2d (patch) | |
| tree | d4de701336264eaff7e4e2b389af9e4588f7d13e /src/tools | |
| parent | ae9f5019f9ce6eb3ecd96206ade4a612efe20fd5 (diff) | |
| parent | e9566ce9e92df5fbdf87260cef7f3aa8d096e1bd (diff) | |
| download | rust-600edc948ab5de7a92538bcc2f49cb8d47925e2d.tar.gz rust-600edc948ab5de7a92538bcc2f49cb8d47925e2d.zip | |
Auto merge of #128134 - joboet:move_pal_alloc, r=cupiver
std: move allocators to `sys` Part of #117276.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/miri/tests/fail/alloc/global_system_mixup.rs | 4 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/alloc/global_system_mixup.stderr | 4 |
2 files changed, 5 insertions, 3 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 804aa13660b..bbf069b7a2d 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,9 @@ //@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: "unsafe \{ libc::free\([^()]*\) \}|unsafe \{ HeapFree\([^}]*\};" -> "FREE();" +//@normalize-stderr-test: "alloc::[A-Za-z]+::" -> "alloc::PLATFORM::" +//@normalize-stderr-test: "alloc/[A-Za-z]+.rs" -> "alloc/PLATFORM.rs" #![feature(allocator_api, slice_ptr_get)] diff --git a/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr b/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr index 77909564149..287a1f1a3e3 100644 --- a/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr +++ b/src/tools/miri/tests/fail/alloc/global_system_mixup.stderr @@ -1,5 +1,5 @@ error: Undefined Behavior: deallocating ALLOC, which is Rust heap memory, using PLATFORM heap deallocation operation - --> RUSTLIB/std/src/sys/pal/PLATFORM/alloc.rs:LL:CC + --> RUSTLIB/std/src/sys/alloc/PLATFORM.rs:LL:CC | LL | FREE(); | ^ deallocating ALLOC, which is Rust heap memory, using PLATFORM heap deallocation operation @@ -7,7 +7,7 @@ LL | FREE(); = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: BACKTRACE: - = note: inside `std::sys::pal::PLATFORM::alloc::<impl std::alloc::GlobalAlloc for std::alloc::System>::dealloc` at RUSTLIB/std/src/sys/pal/PLATFORM/alloc.rs:LL:CC + = note: inside `std::sys::alloc::PLATFORM::<impl std::alloc::GlobalAlloc for std::alloc::System>::dealloc` at RUSTLIB/std/src/sys/alloc/PLATFORM.rs:LL:CC = note: inside `<std::alloc::System as std::alloc::Allocator>::deallocate` at RUSTLIB/std/src/alloc.rs:LL:CC note: inside `main` --> $DIR/global_system_mixup.rs:LL:CC |