diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-20 14:26:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-20 14:26:54 +0200 |
| commit | e45fd0686fe9a4a616bf91bcab4064de80261d57 (patch) | |
| tree | 18d3842c6db7df977d2ebff54fe9b8b4f66d3923 | |
| parent | 3a503157a065b615f9e2d051a9b0adb91dda4566 (diff) | |
| parent | 4654e87d4c6c80f737d486ae15c0eeebb77269ed (diff) | |
| download | rust-e45fd0686fe9a4a616bf91bcab4064de80261d57.tar.gz rust-e45fd0686fe9a4a616bf91bcab4064de80261d57.zip | |
Rollup merge of #125309 - nnethercote:fix-strings-and-strs, r=Mark-Simulacrum
Fix `tests/debuginfo/strings-and-strs`. It fails on my machine because it embeds pointer addresses in the expected output. This commit replaces the addresses with `0x[...]`. r? ```@Mark-Simulacrum```
| -rw-r--r-- | tests/debuginfo/strings-and-strs.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/debuginfo/strings-and-strs.rs b/tests/debuginfo/strings-and-strs.rs index 48d40d167ba..4a6adc2fc53 100644 --- a/tests/debuginfo/strings-and-strs.rs +++ b/tests/debuginfo/strings-and-strs.rs @@ -7,7 +7,7 @@ // gdb-command:run // gdb-command:print plain_string -// gdbr-check:$1 = alloc::string::String {vec: alloc::vec::Vec<u8, alloc::alloc::Global> {buf: alloc::raw_vec::RawVec<u8, alloc::alloc::Global> {ptr: core::ptr::unique::Unique<u8> {pointer: core::ptr::non_null::NonNull<u8> {pointer: 0x55555555ab80}, _marker: core::marker::PhantomData<u8>}, cap: alloc::raw_vec::Cap (5), alloc: alloc::alloc::Global}, len: 5}} +// gdbr-check:$1 = alloc::string::String {vec: alloc::vec::Vec<u8, alloc::alloc::Global> {buf: alloc::raw_vec::RawVec<u8, alloc::alloc::Global> {ptr: core::ptr::unique::Unique<u8> {pointer: core::ptr::non_null::NonNull<u8> {pointer: 0x[...]}, _marker: core::marker::PhantomData<u8>}, cap: alloc::raw_vec::Cap (5), alloc: alloc::alloc::Global}, len: 5}} // gdb-command:print plain_str // gdbr-check:$2 = "Hello" @@ -19,7 +19,7 @@ // gdbr-check:$4 = ("Hello", "World") // gdb-command:print str_in_rc -// gdbr-check:$5 = alloc::rc::Rc<&str, alloc::alloc::Global> {ptr: core::ptr::non_null::NonNull<alloc::rc::RcBox<&str>> {pointer: 0x55555555aae0}, phantom: core::marker::PhantomData<alloc::rc::RcBox<&str>>, alloc: alloc::alloc::Global} +// gdbr-check:$5 = alloc::rc::Rc<&str, alloc::alloc::Global> {ptr: core::ptr::non_null::NonNull<alloc::rc::RcBox<&str>> {pointer: 0x[...]}, phantom: core::marker::PhantomData<alloc::rc::RcBox<&str>>, alloc: alloc::alloc::Global} // === LLDB TESTS ================================================================================== |
