Update debuginfo tests

Author: zachs18

src/etc/natvis/liballoc.natvis

@@ -40,7 +40,7 @@
       </LinkedListItems>
     </Expand>
   </Type>
-  <Type Name="alloc::string::String">
+  <Type Name="alloc::string::string::String&lt;*&gt;">
     <DisplayString>{(char*)vec.buf.inner.ptr.pointer.pointer,[vec.len]s8}</DisplayString>
     <StringView>(char*)vec.buf.inner.ptr.pointer.pointer,[vec.len]s8</StringView>
     <Expand>

tests/debuginfo/closures.rs

@@ -14,7 +14,7 @@
 // cdb-check:     [+0x[...]] _ref__count      : 0x[...] : 2 [Type: int *]
 // cdb-command:dx consume_closure
 // cdb-check:consume_closure  [Type: closures::main::closure_env$2]
-// cdb-check:     [+0x[...]] x                : [...] [Type: alloc::string::String]
+// cdb-check:     [+0x[...]] x                : [...] [Type: alloc::string::string::String<alloc::alloc::Global>]
 // cdb-check:     [+0x[...]] _ref__base_value : 0x[...] : 42 [Type: int *]
 // cdb-command:dx simple_closure
 // cdb-checksimple_closure   [Type: closures::main::closure_env$5]

tests/debuginfo/coroutine-closure.rs

@@ -7,8 +7,8 @@
 // cdb-command: g
 // cdb-command: dx closure
 // cdb-check:closure          [Type: coroutine_closure::main::closure_env$0]
-// cdb-check:     [+0x[...]] y                : "" [Type: alloc::string::String]
-// cdb-check:     [+0x[...]] x                : "" [Type: alloc::string::String]
+// cdb-check:     [+0x[...]] y                : "" [Type: alloc::string::string::String<alloc::alloc::Global>]
+// cdb-check:     [+0x[...]] x                : "" [Type: alloc::string::string::String<alloc::alloc::Global>]
 #![allow(unused)]
 fn main() {
     let x = String::new();

tests/debuginfo/msvc-pretty-enums.rs

@@ -30,7 +30,7 @@
 // lldb-check:(msvc_pretty_enums::CStyleEnum) j = High
 
 // lldb-command:v k
-// lldb-check:(core::option::Option<alloc::string::String>) k = { value = { 0 = "IAMA optional string!" { vec = size=21 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 'o' [6] = 'p' [7] = 't' [8] = 'i' [9] = 'o' [10] = 'n' [11] = 'a' [12] = 'l' [13] = ' ' [14] = 's' [15] = 't' [16] = 'r' [17] = 'i' [18] = 'n' [19] = 'g' [20] = '!' } } } }
+// lldb-check:(core::option::Option<alloc::string::string::String<alloc::alloc::Global>>) k = { value = { 0 = "IAMA optional string!" { vec = size=21 { [0] = 'I' [1] = 'A' [2] = 'M' [3] = 'A' [4] = ' ' [5] = 'o' [6] = 'p' [7] = 't' [8] = 'i' [9] = 'o' [10] = 'n' [11] = 'a' [12] = 'l' [13] = ' ' [14] = 's' [15] = 't' [16] = 'r' [17] = 'i' [18] = 'n' [19] = 'g' [20] = '!' } } } }
 
 // lldb-command:v l
 // lldb-check:(core::result::Result<u32, msvc_pretty_enums::Empty>) l = { value = { 0 = {} } }

tests/debuginfo/pretty-std.rs

@@ -31,11 +31,11 @@
 // gdb-check:$7 = "IAMA OS string 😃"
 
 // gdb-command: print some_string
-// gdb-check:$8 = core::option::Option<alloc::string::String>::Some("IAMA optional string!")
+// gdb-check:$8 = core::option::Option<alloc::string::string::String<alloc::alloc::Global>>::Some("IAMA optional string!")
 
 // gdb-command: set print elements 5
 // gdb-command: print some_string
-// gdb-check:$9 = core::option::Option<alloc::string::String>::Some("IAMA "...)
+// gdb-check:$9 = core::option::Option<alloc::string::string::String<alloc::alloc::Global>>::Some("IAMA "...)
 
 // === LLDB TESTS ==================================================================================
 

tests/debuginfo/strings-and-strs.rs

@@ -7,7 +7,7 @@
 // gdb-command:run
 
 // gdb-command:print plain_string
-// gdb-check:$1 = alloc::string::String {vec: alloc::vec::Vec<u8, alloc::alloc::Global> {buf: alloc::raw_vec::RawVec<u8, alloc::alloc::Global> {inner: alloc::raw_vec::RawVecInner<alloc::alloc::Global> {ptr: core::ptr::unique::Unique<u8> {pointer: core::ptr::non_null::NonNull<u8> {pointer: 0x[...]}, _marker: core::marker::PhantomData<u8>}, cap: core::num::niche_types::UsizeNoHighBit (5), alloc: alloc::alloc::Global}, _marker: core::marker::PhantomData<u8>}, len: 5}}
+// gdb-check:$1 = alloc::string::string::String<alloc::alloc::Global> {vec: alloc::vec::Vec<u8, alloc::alloc::Global> {buf: alloc::raw_vec::RawVec<u8, alloc::alloc::Global> {inner: alloc::raw_vec::RawVecInner<alloc::alloc::Global> {ptr: core::ptr::unique::Unique<u8> {pointer: core::ptr::non_null::NonNull<u8> {pointer: 0x[...]}, _marker: core::marker::PhantomData<u8>}, cap: core::num::niche_types::UsizeNoHighBit (5), alloc: alloc::alloc::Global}, _marker: core::marker::PhantomData<u8>}, len: 5}}
 
 // gdb-command:print plain_str
 // gdb-check:$2 = "Hello"
@@ -24,7 +24,7 @@
 // === LLDB TESTS ==================================================================================
 // lldb-command:run
 // lldb-command:v plain_string
-// lldb-check:(alloc::string::String) plain_string = "Hello" { vec = size=5 { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } }
+// lldb-check:(alloc::string::string::String<alloc::alloc::Global>) plain_string = "Hello" { vec = size=5 { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } }
 
 // lldb-command:v plain_str
 // lldb-check:(&str) plain_str = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' }
@@ -38,7 +38,6 @@
 // lldb-command:v str_in_rc
 // lldb-check:(alloc::rc::Rc<&str, alloc::alloc::Global>) str_in_rc = strong=1, weak=0 { value = "Hello" { [0] = 'H' [1] = 'e' [2] = 'l' [3] = 'l' [4] = 'o' } }
 
-
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
 #![omit_gdb_pretty_printer_section]