Replace gdbr with gdbg

tests/debuginfo/associated-types.rs

@@ -8,7 +8,7 @@
 // gdb-command:run
 
 // gdb-command:print arg
-// gdbr-check:$1 = associated_types::Struct<i32> {b: -1, b1: 0}
+// gdb-check:$1 = associated_types::Struct<i32> {b: -1, b1: 0}
 // gdb-command:continue
 
 // gdb-command:print inferred
@@ -22,7 +22,7 @@
 // gdb-command:continue
 
 // gdb-command:print arg
-// gdbr-check:$5 = (4, 5)
+// gdb-check:$5 = (4, 5)
 // gdb-command:continue
 
 // gdb-command:print a

tests/debuginfo/basic-types-globals-metadata.rs

@@ -2,35 +2,35 @@
 
 //@ compile-flags:-g
 // gdb-command:run
-// gdbr-command:whatis basic_types_globals_metadata::B
+// gdb-command:whatis basic_types_globals_metadata::B
 // gdb-check:type = bool
-// gdbr-command:whatis basic_types_globals_metadata::I
+// gdb-command:whatis basic_types_globals_metadata::I
 // gdb-check:type = isize
-// gdbr-command:whatis basic_types_globals_metadata::C
+// gdb-command:whatis basic_types_globals_metadata::C
 // gdb-check:type = char
-// gdbr-command:whatis basic_types_globals_metadata::I8
+// gdb-command:whatis basic_types_globals_metadata::I8
 // gdb-check:type = i8
-// gdbr-command:whatis basic_types_globals_metadata::I16
+// gdb-command:whatis basic_types_globals_metadata::I16
 // gdb-check:type = i16
-// gdbr-command:whatis basic_types_globals_metadata::I32
+// gdb-command:whatis basic_types_globals_metadata::I32
 // gdb-check:type = i32
-// gdbr-command:whatis basic_types_globals_metadata::I64
+// gdb-command:whatis basic_types_globals_metadata::I64
 // gdb-check:type = i64
-// gdbr-command:whatis basic_types_globals_metadata::U
+// gdb-command:whatis basic_types_globals_metadata::U
 // gdb-check:type = usize
-// gdbr-command:whatis basic_types_globals_metadata::U8
+// gdb-command:whatis basic_types_globals_metadata::U8
 // gdb-check:type = u8
-// gdbr-command:whatis basic_types_globals_metadata::U16
+// gdb-command:whatis basic_types_globals_metadata::U16
 // gdb-check:type = u16
-// gdbr-command:whatis basic_types_globals_metadata::U32
+// gdb-command:whatis basic_types_globals_metadata::U32
 // gdb-check:type = u32
-// gdbr-command:whatis basic_types_globals_metadata::U64
+// gdb-command:whatis basic_types_globals_metadata::U64
 // gdb-check:type = u64
-// gdbr-command:whatis basic_types_globals_metadata::F16
+// gdb-command:whatis basic_types_globals_metadata::F16
 // gdb-check:type = f16
-// gdbr-command:whatis basic_types_globals_metadata::F32
+// gdb-command:whatis basic_types_globals_metadata::F32
 // gdb-check:type = f32
-// gdbr-command:whatis basic_types_globals_metadata::F64
+// gdb-command:whatis basic_types_globals_metadata::F64
 // gdb-check:type = f64
 // gdb-command:continue
 

tests/debuginfo/basic-types-globals.rs

@@ -12,35 +12,35 @@
 //@ [lto] no-prefer-dynamic
 
 // gdb-command:run
-// gdbr-command:print B
+// gdb-command:print B
 // gdb-check:$1 = false
-// gdbr-command:print I
+// gdb-command:print I
 // gdb-check:$2 = -1
-// gdbr-command:print/d C
+// gdb-command:print/d C
-// gdbr-check:$3 = 97
+// gdb-check:$3 = 97
-// gdbr-command:print I8
+// gdb-command:print I8
 // gdb-check:$4 = 68
-// gdbr-command:print I16
+// gdb-command:print I16
 // gdb-check:$5 = -16
-// gdbr-command:print I32
+// gdb-command:print I32
 // gdb-check:$6 = -32
-// gdbr-command:print I64
+// gdb-command:print I64
 // gdb-check:$7 = -64
-// gdbr-command:print U
+// gdb-command:print U
 // gdb-check:$8 = 1
-// gdbr-command:print U8
+// gdb-command:print U8
 // gdb-check:$9 = 100
-// gdbr-command:print U16
+// gdb-command:print U16
 // gdb-check:$10 = 16
-// gdbr-command:print U32
+// gdb-command:print U32
 // gdb-check:$11 = 32
-// gdbr-command:print U64
+// gdb-command:print U64
 // gdb-check:$12 = 64
-// gdbr-command:print F16
+// gdb-command:print F16
 // gdb-check:$13 = 1.5
-// gdbr-command:print F32
+// gdb-command:print F32
 // gdb-check:$14 = 2.5
-// gdbr-command:print F64
+// gdb-command:print F64
 // gdb-check:$15 = 3.5
 // gdb-command:continue
 

tests/debuginfo/basic-types-metadata.rs

@@ -37,18 +37,18 @@
 // gdb-command:whatis fnptr
 // gdb-check:type = *mut fn ()
 // gdb-command:info functions _yyy
-// gdbr-check:static fn basic_types_metadata::_yyy();
+// gdb-check:static fn basic_types_metadata::_yyy();
 // gdb-command:ptype closure_0
-// gdbr-check: type = struct basic_types_metadata::main::{closure_env#0}
+// gdb-check: type = struct basic_types_metadata::main::{closure_env#0}
 // gdb-command:ptype closure_1
-// gdbr-check: type = struct basic_types_metadata::main::{closure_env#1} {
+// gdb-check: type = struct basic_types_metadata::main::{closure_env#1} {
-// gdbr-check:     *mut bool,
+// gdb-check:     *mut bool,
-// gdbr-check: }
+// gdb-check: }
 // gdb-command:ptype closure_2
-// gdbr-check: type = struct basic_types_metadata::main::{closure_env#2} {
+// gdb-check: type = struct basic_types_metadata::main::{closure_env#2} {
-// gdbr-check:     *mut bool,
+// gdb-check:     *mut bool,
-// gdbr-check:     *mut isize,
+// gdb-check:     *mut isize,
-// gdbr-check: }
+// gdb-check: }
 
 //
 // gdb-command:continue

tests/debuginfo/basic-types-mut-globals.rs

@@ -11,68 +11,68 @@
 // gdb-command:run
 
 // Check initializers
-// gdbr-command:print B
+// gdb-command:print B
 // gdb-check:$1 = false
-// gdbr-command:print I
+// gdb-command:print I
 // gdb-check:$2 = -1
-// gdbr-command:print C
+// gdb-command:print C
-// gdbr-check:$3 = 97 'a'
+// gdb-check:$3 = 97 'a'
-// gdbr-command:print I8
+// gdb-command:print I8
 // gdb-check:$4 = 68
-// gdbr-command:print I16
+// gdb-command:print I16
 // gdb-check:$5 = -16
-// gdbr-command:print I32
+// gdb-command:print I32
 // gdb-check:$6 = -32
-// gdbr-command:print I64
+// gdb-command:print I64
 // gdb-check:$7 = -64
-// gdbr-command:print U
+// gdb-command:print U
 // gdb-check:$8 = 1
-// gdbr-command:print U8
+// gdb-command:print U8
 // gdb-check:$9 = 100
-// gdbr-command:print U16
+// gdb-command:print U16
 // gdb-check:$10 = 16
-// gdbr-command:print U32
+// gdb-command:print U32
 // gdb-check:$11 = 32
-// gdbr-command:print U64
+// gdb-command:print U64
 // gdb-check:$12 = 64
-// gdbr-command:print F16
+// gdb-command:print F16
 // gdb-check:$13 = 1.5
-// gdbr-command:print F32
+// gdb-command:print F32
 // gdb-check:$14 = 2.5
-// gdbr-command:print F64
+// gdb-command:print F64
 // gdb-check:$15 = 3.5
 // gdb-command:continue
 
 // Check new values
-// gdbr-command:print B
+// gdb-command:print B
 // gdb-check:$16 = true
-// gdbr-command:print I
+// gdb-command:print I
 // gdb-check:$17 = 2
-// gdbr-command:print C
+// gdb-command:print C
-// gdbr-check:$18 = 102 'f'
+// gdb-check:$18 = 102 'f'
-// gdbr-command:print/d I8
+// gdb-command:print/d I8
 // gdb-check:$19 = 78
-// gdbr-command:print I16
+// gdb-command:print I16
 // gdb-check:$20 = -26
-// gdbr-command:print I32
+// gdb-command:print I32
 // gdb-check:$21 = -12
-// gdbr-command:print I64
+// gdb-command:print I64
 // gdb-check:$22 = -54
-// gdbr-command:print U
+// gdb-command:print U
 // gdb-check:$23 = 5
-// gdbr-command:print/d U8
+// gdb-command:print/d U8
 // gdb-check:$24 = 20
-// gdbr-command:print U16
+// gdb-command:print U16
 // gdb-check:$25 = 32
-// gdbr-command:print U32
+// gdb-command:print U32
 // gdb-check:$26 = 16
-// gdbr-command:print U64
+// gdb-command:print U64
 // gdb-check:$27 = 128
-// gdbr-command:print F16
+// gdb-command:print F16
 // gdb-check:$28 = 2.25
-// gdbr-command:print F32
+// gdb-command:print F32
 // gdb-check:$29 = 5.75
-// gdbr-command:print F64
+// gdb-command:print F64
 // gdb-check:$30 = 9.25
 
 #![allow(unused_variables)]

tests/debuginfo/basic-types.rs

@@ -16,7 +16,7 @@
 // gdb-command:print i
 // gdb-check:$2 = -1
 // gdb-command:print c
-// gdbr-check:$3 = 97 'a'
+// gdb-check:$3 = 97 'a'
 // gdb-command:print/d i8
 // gdb-check:$4 = 68
 // gdb-command:print i16
@@ -42,7 +42,7 @@
 // gdb-command:print f64
 // gdb-check:$15 = 3.5
 // gdb-command:print s
-// gdbr-check:$16 = "Hello, World!"
+// gdb-check:$16 = "Hello, World!"
 
 // === LLDB TESTS ==================================================================================
 

tests/debuginfo/borrowed-basic.rs

@@ -14,7 +14,7 @@
 // gdb-check:$3 = 97
 
 // gdb-command:print *i8_ref
-// gdbr-check:$4 = 68
+// gdb-check:$4 = 68
 
 // gdb-command:print *i16_ref
 // gdb-check:$5 = -16
@@ -29,7 +29,7 @@
 // gdb-check:$8 = 1
 
 // gdb-command:print *u8_ref
-// gdbr-check:$9 = 100
+// gdb-check:$9 = 100
 
 // gdb-command:print *u16_ref
 // gdb-check:$10 = 16

tests/debuginfo/borrowed-c-style-enum.rs

@@ -6,13 +6,13 @@
 // gdb-command:run
 
 // gdb-command:print *the_a_ref
-// gdbr-check:$1 = borrowed_c_style_enum::ABC::TheA
+// gdb-check:$1 = borrowed_c_style_enum::ABC::TheA
 
 // gdb-command:print *the_b_ref
-// gdbr-check:$2 = borrowed_c_style_enum::ABC::TheB
+// gdb-check:$2 = borrowed_c_style_enum::ABC::TheB
 
 // gdb-command:print *the_c_ref
-// gdbr-check:$3 = borrowed_c_style_enum::ABC::TheC
+// gdb-check:$3 = borrowed_c_style_enum::ABC::TheC
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/borrowed-enum.rs

@@ -9,13 +9,13 @@
 // gdb-command:run
 
 // gdb-command:print *the_a_ref
-// gdbr-check:$1 = borrowed_enum::ABC::TheA{x: 0, y: 8970181431921507452}
+// gdb-check:$1 = borrowed_enum::ABC::TheA{x: 0, y: 8970181431921507452}
 
 // gdb-command:print *the_b_ref
-// gdbr-check:$2 = borrowed_enum::ABC::TheB(0, 286331153, 286331153)
+// gdb-check:$2 = borrowed_enum::ABC::TheB(0, 286331153, 286331153)
 
 // gdb-command:print *univariant_ref
-// gdbr-check:$3 = borrowed_enum::Univariant::TheOnlyCase(4820353753753434)
+// gdb-check:$3 = borrowed_enum::Univariant::TheOnlyCase(4820353753753434)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/borrowed-struct.rs

@@ -6,7 +6,7 @@
 // gdb-command:run
 
 // gdb-command:print *stack_val_ref
-// gdbr-check:$1 = borrowed_struct::SomeStruct {x: 10, y: 23.5}
+// gdb-check:$1 = borrowed_struct::SomeStruct {x: 10, y: 23.5}
 
 // gdb-command:print *stack_val_interior_ref_1
 // gdb-check:$2 = 10
@@ -15,10 +15,10 @@
 // gdb-check:$3 = 23.5
 
 // gdb-command:print *ref_to_unnamed
-// gdbr-check:$4 = borrowed_struct::SomeStruct {x: 11, y: 24.5}
+// gdb-check:$4 = borrowed_struct::SomeStruct {x: 11, y: 24.5}
 
 // gdb-command:print *unique_val_ref
-// gdbr-check:$5 = borrowed_struct::SomeStruct {x: 13, y: 26.5}
+// gdb-check:$5 = borrowed_struct::SomeStruct {x: 13, y: 26.5}
 
 // gdb-command:print *unique_val_interior_ref_1
 // gdb-check:$6 = 13

tests/debuginfo/borrowed-tuple.rs

@@ -7,13 +7,13 @@
 // gdb-command:run
 
 // gdb-command:print *stack_val_ref
-// gdbr-check:$1 = (-14, -19)
+// gdb-check:$1 = (-14, -19)
 
 // gdb-command:print *ref_to_unnamed
-// gdbr-check:$2 = (-15, -20)
+// gdb-check:$2 = (-15, -20)
 
 // gdb-command:print *unique_val_ref
-// gdbr-check:$3 = (-17, -22)
+// gdb-check:$3 = (-17, -22)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/box.rs

@@ -9,7 +9,7 @@
 // gdb-command:print *a
 // gdb-check:$1 = 1
 // gdb-command:print *b
-// gdbr-check:$2 = (2, 3.5)
+// gdb-check:$2 = (2, 3.5)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/boxed-struct.rs

@@ -7,10 +7,10 @@
 // gdb-command:run
 
 // gdb-command:print *boxed_with_padding
-// gdbr-check:$1 = boxed_struct::StructWithSomePadding {x: 99, y: 999, z: 9999, w: 99999}
+// gdb-check:$1 = boxed_struct::StructWithSomePadding {x: 99, y: 999, z: 9999, w: 99999}
 
 // gdb-command:print *boxed_with_dtor
-// gdbr-check:$2 = boxed_struct::StructWithDestructor {x: 77, y: 777, z: 7777, w: 77777}
+// gdb-check:$2 = boxed_struct::StructWithDestructor {x: 77, y: 777, z: 7777, w: 77777}
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/by-value-non-immediate-argument.rs

@@ -7,11 +7,11 @@
 // gdb-command:run
 
 // gdb-command:print s
-// gdbr-check:$1 = by_value_non_immediate_argument::Struct {a: 1, b: 2.5}
+// gdb-check:$1 = by_value_non_immediate_argument::Struct {a: 1, b: 2.5}
 // gdb-command:continue
 
 // gdb-command:print x
-// gdbr-check:$2 = by_value_non_immediate_argument::Struct {a: 3, b: 4.5}
+// gdb-check:$2 = by_value_non_immediate_argument::Struct {a: 3, b: 4.5}
 // gdb-command:print y
 // gdb-check:$3 = 5
 // gdb-command:print z
@@ -19,15 +19,15 @@
 // gdb-command:continue
 
 // gdb-command:print a
-// gdbr-check:$5 = (7, 8, 9.5, 10.5)
+// gdb-check:$5 = (7, 8, 9.5, 10.5)
 // gdb-command:continue
 
 // gdb-command:print a
-// gdbr-check:$6 = by_value_non_immediate_argument::Newtype (11.5, 12.5, 13, 14)
+// gdb-check:$6 = by_value_non_immediate_argument::Newtype (11.5, 12.5, 13, 14)
 // gdb-command:continue
 
 // gdb-command:print x
-// gdbr-check:$7 = by_value_non_immediate_argument::Enum::Case1{x: 0, y: 8970181431921507452}
+// gdb-check:$7 = by_value_non_immediate_argument::Enum::Case1{x: 0, y: 8970181431921507452}
 // gdb-command:continue
 
 

tests/debuginfo/by-value-self-argument-in-trait-impl.rs

@@ -11,11 +11,11 @@
 // gdb-command:continue
 
 // gdb-command:print self
-// gdbr-check:$2 = by_value_self_argument_in_trait_impl::Struct {x: 2222, y: 3333}
+// gdb-check:$2 = by_value_self_argument_in_trait_impl::Struct {x: 2222, y: 3333}
 // gdb-command:continue
 
 // gdb-command:print self
-// gdbr-check:$3 = (4444.5, 5555, 6666, 7777.5)
+// gdb-check:$3 = (4444.5, 5555, 6666, 7777.5)
 // gdb-command:continue
 
 

tests/debuginfo/c-style-enum-in-composite.rs

@@ -7,25 +7,25 @@
 // gdb-command:run
 
 // gdb-command:print tuple_interior_padding
-// gdbr-check:$1 = (0, c_style_enum_in_composite::AnEnum::OneHundred)
+// gdb-check:$1 = (0, c_style_enum_in_composite::AnEnum::OneHundred)
 
 // gdb-command:print tuple_padding_at_end
-// gdbr-check:$2 = ((1, c_style_enum_in_composite::AnEnum::OneThousand), 2)
+// gdb-check:$2 = ((1, c_style_enum_in_composite::AnEnum::OneThousand), 2)
 
 // gdb-command:print tuple_different_enums
-// gdbr-check:$3 = (c_style_enum_in_composite::AnEnum::OneThousand, c_style_enum_in_composite::AnotherEnum::MountainView, c_style_enum_in_composite::AnEnum::OneMillion, c_style_enum_in_composite::AnotherEnum::Vienna)
+// gdb-check:$3 = (c_style_enum_in_composite::AnEnum::OneThousand, c_style_enum_in_composite::AnotherEnum::MountainView, c_style_enum_in_composite::AnEnum::OneMillion, c_style_enum_in_composite::AnotherEnum::Vienna)
 
 // gdb-command:print padded_struct
-// gdbr-check:$4 = c_style_enum_in_composite::PaddedStruct {a: 3, b: c_style_enum_in_composite::AnEnum::OneMillion, c: 4, d: c_style_enum_in_composite::AnotherEnum::Toronto, e: 5}
+// gdb-check:$4 = c_style_enum_in_composite::PaddedStruct {a: 3, b: c_style_enum_in_composite::AnEnum::OneMillion, c: 4, d: c_style_enum_in_composite::AnotherEnum::Toronto, e: 5}
 
 // gdb-command:print packed_struct
-// gdbr-check:$5 = c_style_enum_in_composite::PackedStruct {a: 6, b: c_style_enum_in_composite::AnEnum::OneHundred, c: 7, d: c_style_enum_in_composite::AnotherEnum::Vienna, e: 8}
+// gdb-check:$5 = c_style_enum_in_composite::PackedStruct {a: 6, b: c_style_enum_in_composite::AnEnum::OneHundred, c: 7, d: c_style_enum_in_composite::AnotherEnum::Vienna, e: 8}
 
 // gdb-command:print non_padded_struct
-// gdbr-check:$6 = c_style_enum_in_composite::NonPaddedStruct {a: c_style_enum_in_composite::AnEnum::OneMillion, b: c_style_enum_in_composite::AnotherEnum::MountainView, c: c_style_enum_in_composite::AnEnum::OneThousand, d: c_style_enum_in_composite::AnotherEnum::Toronto}
+// gdb-check:$6 = c_style_enum_in_composite::NonPaddedStruct {a: c_style_enum_in_composite::AnEnum::OneMillion, b: c_style_enum_in_composite::AnotherEnum::MountainView, c: c_style_enum_in_composite::AnEnum::OneThousand, d: c_style_enum_in_composite::AnotherEnum::Toronto}
 
 // gdb-command:print struct_with_drop
-// gdbr-check:$7 = (c_style_enum_in_composite::StructWithDrop {a: c_style_enum_in_composite::AnEnum::OneHundred, b: c_style_enum_in_composite::AnotherEnum::Vienna}, 9)
+// gdb-check:$7 = (c_style_enum_in_composite::StructWithDrop {a: c_style_enum_in_composite::AnEnum::OneHundred, b: c_style_enum_in_composite::AnotherEnum::Vienna}, 9)
 
 // === LLDB TESTS ==================================================================================
 

tests/debuginfo/c-style-enum.rs

@@ -5,61 +5,61 @@
 
 // === GDB TESTS ===================================================================================
 
-// gdbr-command:print c_style_enum::SINGLE_VARIANT
+// gdb-command:print c_style_enum::SINGLE_VARIANT
-// gdbr-check:$1 = c_style_enum::SingleVariant::TheOnlyVariant
+// gdb-check:$1 = c_style_enum::SingleVariant::TheOnlyVariant
 
-// gdbr-command:print c_style_enum::AUTO_ONE
+// gdb-command:print c_style_enum::AUTO_ONE
-// gdbr-check:$2 = c_style_enum::AutoDiscriminant::One
+// gdb-check:$2 = c_style_enum::AutoDiscriminant::One
 
-// gdbr-command:print c_style_enum::AUTO_TWO
+// gdb-command:print c_style_enum::AUTO_TWO
-// gdbr-check:$3 = c_style_enum::AutoDiscriminant::One
+// gdb-check:$3 = c_style_enum::AutoDiscriminant::One
 
-// gdbr-command:print c_style_enum::AUTO_THREE
+// gdb-command:print c_style_enum::AUTO_THREE
-// gdbr-check:$4 = c_style_enum::AutoDiscriminant::One
+// gdb-check:$4 = c_style_enum::AutoDiscriminant::One
 
-// gdbr-command:print c_style_enum::MANUAL_ONE
+// gdb-command:print c_style_enum::MANUAL_ONE
-// gdbr-check:$5 = c_style_enum::ManualDiscriminant::OneHundred
+// gdb-check:$5 = c_style_enum::ManualDiscriminant::OneHundred
 
-// gdbr-command:print c_style_enum::MANUAL_TWO
+// gdb-command:print c_style_enum::MANUAL_TWO
-// gdbr-check:$6 = c_style_enum::ManualDiscriminant::OneHundred
+// gdb-check:$6 = c_style_enum::ManualDiscriminant::OneHundred
 
-// gdbr-command:print c_style_enum::MANUAL_THREE
+// gdb-command:print c_style_enum::MANUAL_THREE
-// gdbr-check:$7 = c_style_enum::ManualDiscriminant::OneHundred
+// gdb-check:$7 = c_style_enum::ManualDiscriminant::OneHundred
 
 // gdb-command:run
 
 // gdb-command:print auto_one
-// gdbr-check:$8 = c_style_enum::AutoDiscriminant::One
+// gdb-check:$8 = c_style_enum::AutoDiscriminant::One
 
 // gdb-command:print auto_two
-// gdbr-check:$9 = c_style_enum::AutoDiscriminant::Two
+// gdb-check:$9 = c_style_enum::AutoDiscriminant::Two
 
 // gdb-command:print auto_three
-// gdbr-check:$10 = c_style_enum::AutoDiscriminant::Three
+// gdb-check:$10 = c_style_enum::AutoDiscriminant::Three
 
 // gdb-command:print manual_one_hundred
-// gdbr-check:$11 = c_style_enum::ManualDiscriminant::OneHundred
+// gdb-check:$11 = c_style_enum::ManualDiscriminant::OneHundred
 
 // gdb-command:print manual_one_thousand
-// gdbr-check:$12 = c_style_enum::ManualDiscriminant::OneThousand
+// gdb-check:$12 = c_style_enum::ManualDiscriminant::OneThousand
 
 // gdb-command:print manual_one_million
-// gdbr-check:$13 = c_style_enum::ManualDiscriminant::OneMillion
+// gdb-check:$13 = c_style_enum::ManualDiscriminant::OneMillion
 
 // gdb-command:print single_variant
-// gdbr-check:$14 = c_style_enum::SingleVariant::TheOnlyVariant
+// gdb-check:$14 = c_style_enum::SingleVariant::TheOnlyVariant
 
-// gdbr-command:print AUTO_TWO
+// gdb-command:print AUTO_TWO
-// gdbr-check:$15 = c_style_enum::AutoDiscriminant::Two
+// gdb-check:$15 = c_style_enum::AutoDiscriminant::Two
 
-// gdbr-command:print AUTO_THREE
+// gdb-command:print AUTO_THREE
-// gdbr-check:$16 = c_style_enum::AutoDiscriminant::Three
+// gdb-check:$16 = c_style_enum::AutoDiscriminant::Three
 
-// gdbr-command:print MANUAL_TWO
+// gdb-command:print MANUAL_TWO
-// gdbr-check:$17 = c_style_enum::ManualDiscriminant::OneThousand
+// gdb-check:$17 = c_style_enum::ManualDiscriminant::OneThousand
 
-// gdbr-command:print MANUAL_THREE
+// gdb-command:print MANUAL_THREE
-// gdbr-check:$18 = c_style_enum::ManualDiscriminant::OneMillion
+// gdb-check:$18 = c_style_enum::ManualDiscriminant::OneMillion
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/captured-fields-1.rs

@@ -4,22 +4,22 @@
 
 // gdb-command:run
 // gdb-command:print test
-// gdbr-check:$1 = captured_fields_1::main::{closure_env#0} {_ref__my_ref__my_field1: 0x[...]}
+// gdb-check:$1 = captured_fields_1::main::{closure_env#0} {_ref__my_ref__my_field1: 0x[...]}
 // gdb-command:continue
 // gdb-command:print test
-// gdbr-check:$2 = captured_fields_1::main::{closure_env#1} {_ref__my_ref__my_field2: 0x[...]}
+// gdb-check:$2 = captured_fields_1::main::{closure_env#1} {_ref__my_ref__my_field2: 0x[...]}
 // gdb-command:continue
 // gdb-command:print test
-// gdbr-check:$3 = captured_fields_1::main::{closure_env#2} {_ref__my_ref: 0x[...]}
+// gdb-check:$3 = captured_fields_1::main::{closure_env#2} {_ref__my_ref: 0x[...]}
 // gdb-command:continue
 // gdb-command:print test
-// gdbr-check:$4 = captured_fields_1::main::{closure_env#3} {my_ref: 0x[...]}
+// gdb-check:$4 = captured_fields_1::main::{closure_env#3} {my_ref: 0x[...]}
 // gdb-command:continue
 // gdb-command:print test
-// gdbr-check:$5 = captured_fields_1::main::{closure_env#4} {my_var__my_field2: 22}
+// gdb-check:$5 = captured_fields_1::main::{closure_env#4} {my_var__my_field2: 22}
 // gdb-command:continue
 // gdb-command:print test
-// gdbr-check:$6 = captured_fields_1::main::{closure_env#5} {my_var: captured_fields_1::MyStruct {my_field1: 11, my_field2: 22}}
+// gdb-check:$6 = captured_fields_1::main::{closure_env#5} {my_var: captured_fields_1::MyStruct {my_field1: 11, my_field2: 22}}
 // gdb-command:continue
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/captured-fields-2.rs

@@ -4,10 +4,10 @@
 
 // gdb-command:run
 // gdb-command:print my_ref__my_field1
-// gdbr-check:$1 = 11
+// gdb-check:$1 = 11
 // gdb-command:continue
 // gdb-command:print my_var__my_field2
-// gdbr-check:$2 = 22
+// gdb-check:$2 = 22
 // gdb-command:continue
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/cross-crate-spans.rs

@@ -15,7 +15,7 @@ extern crate cross_crate_spans;
 // gdb-command:run
 
 // gdb-command:print result
-// gdbr-check:$1 = (17, 17)
+// gdb-check:$1 = (17, 17)
 // gdb-command:print a_variable
 // gdb-check:$2 = 123456789
 // gdb-command:print another_variable
@@ -23,7 +23,7 @@ extern crate cross_crate_spans;
 // gdb-command:continue
 
 // gdb-command:print result
-// gdbr-check:$4 = (1212, 1212)
+// gdb-check:$4 = (1212, 1212)
 // gdb-command:print a_variable
 // gdb-check:$5 = 123456789
 // gdb-command:print another_variable

tests/debuginfo/destructured-fn-argument.rs

@@ -23,13 +23,13 @@
 // gdb-command:print a
 // gdb-check:$6 = 5
 // gdb-command:print b
-// gdbr-check:$7 = (6, 7)
+// gdb-check:$7 = (6, 7)
 // gdb-command:continue
 
 // gdb-command:print h
 // gdb-check:$8 = 8
 // gdb-command:print i
-// gdbr-check:$9 = destructured_fn_argument::Struct {a: 9, b: 10}
+// gdb-check:$9 = destructured_fn_argument::Struct {a: 9, b: 10}
 // gdb-command:print j
 // gdb-check:$10 = 11
 // gdb-command:continue
@@ -55,7 +55,7 @@
 // gdb-command:print q
 // gdb-check:$17 = 20
 // gdb-command:print r
-// gdbr-check:$18 = destructured_fn_argument::Struct {a: 21, b: 22}
+// gdb-check:$18 = destructured_fn_argument::Struct {a: 21, b: 22}
 // gdb-command:continue
 
 // gdb-command:print s
@@ -85,11 +85,11 @@
 // gdb-command:continue
 
 // gdb-command:print aa
-// gdbr-check:$30 = (34, 35)
+// gdb-check:$30 = (34, 35)
 // gdb-command:continue
 
 // gdb-command:print bb
-// gdbr-check:$31 = (36, 37)
+// gdb-check:$31 = (36, 37)
 // gdb-command:continue
 
 // gdb-command:print cc
@@ -97,17 +97,17 @@
 // gdb-command:continue
 
 // gdb-command:print dd
-// gdbr-check:$33 = (40, 41, 42)
+// gdb-check:$33 = (40, 41, 42)
 // gdb-command:continue
 
 // gdb-command:print *ee
-// gdbr-check:$34 = (43, 44, 45)
+// gdb-check:$34 = (43, 44, 45)
 // gdb-command:continue
 
 // gdb-command:print *ff
 // gdb-check:$35 = 46
 // gdb-command:print gg
-// gdbr-check:$36 = (47, 48)
+// gdb-check:$36 = (47, 48)
 // gdb-command:continue
 
 // gdb-command:print *hh

tests/debuginfo/destructured-for-loop-variable.rs

@@ -63,11 +63,11 @@
 // gdb-command:continue
 
 // gdb-command:print simple_struct_ident
-// gdbr-check:$23 = destructured_for_loop_variable::Struct {x: 3537, y: 35437.5, z: true}
+// gdb-check:$23 = destructured_for_loop_variable::Struct {x: 3537, y: 35437.5, z: true}
 // gdb-command:continue
 
 // gdb-command:print simple_tuple_ident
-// gdbr-check:$24 = (34903493, 232323)
+// gdb-check:$24 = (34903493, 232323)
 // gdb-command:continue
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/destructured-local.rs

@@ -21,12 +21,12 @@
 // gdb-command:print f
 // gdb-check:$6 = 5
 // gdb-command:print g
-// gdbr-check:$7 = (6, 7)
+// gdb-check:$7 = (6, 7)
 
 // gdb-command:print h
 // gdb-check:$8 = 8
 // gdb-command:print i
-// gdbr-check:$9 = destructured_local::Struct {a: 9, b: 10}
+// gdb-check:$9 = destructured_local::Struct {a: 9, b: 10}
 // gdb-command:print j
 // gdb-check:$10 = 11
 
@@ -48,7 +48,7 @@
 // gdb-command:print q
 // gdb-check:$17 = 20
 // gdb-command:print r
-// gdbr-check:$18 = destructured_local::Struct {a: 21, b: 22}
+// gdb-check:$18 = destructured_local::Struct {a: 21, b: 22}
 
 // gdb-command:print s
 // gdb-check:$19 = 24
@@ -75,25 +75,25 @@
 // gdb-check:$29 = 33
 
 // gdb-command:print aa
-// gdbr-check:$30 = (34, 35)
+// gdb-check:$30 = (34, 35)
 
 // gdb-command:print bb
-// gdbr-check:$31 = (36, 37)
+// gdb-check:$31 = (36, 37)
 
 // gdb-command:print cc
 // gdb-check:$32 = 38
 
 // gdb-command:print dd
-// gdbr-check:$33 = (40, 41, 42)
+// gdb-check:$33 = (40, 41, 42)
 
 // gdb-command:print *ee
-// gdbr-check:$34 = (43, 44, 45)
+// gdb-check:$34 = (43, 44, 45)
 
 // gdb-command:print *ff
 // gdb-check:$35 = 46
 
 // gdb-command:print gg
-// gdbr-check:$36 = (47, 48)
+// gdb-check:$36 = (47, 48)
 
 // gdb-command:print *hh
 // gdb-check:$37 = 50

tests/debuginfo/enum-thinlto.rs

@@ -8,7 +8,7 @@
 // gdb-command:run
 
 // gdb-command:print *abc
-// gdbr-check:$1 = enum_thinlto::ABC::TheA{x: 0, y: 8970181431921507452}
+// gdb-check:$1 = enum_thinlto::ABC::TheA{x: 0, y: 8970181431921507452}
 
 // === LLDB TESTS ==================================================================================
 

tests/debuginfo/evec-in-struct.rs

@@ -7,18 +7,18 @@
 // gdb-command:run
 
 // gdb-command:print no_padding1
-// gdbr-check:$1 = evec_in_struct::NoPadding1 {x: [0, 1, 2], y: -3, z: [4.5, 5.5]}
+// gdb-check:$1 = evec_in_struct::NoPadding1 {x: [0, 1, 2], y: -3, z: [4.5, 5.5]}
 // gdb-command:print no_padding2
-// gdbr-check:$2 = evec_in_struct::NoPadding2 {x: [6, 7, 8], y: [[9, 10], [11, 12]]}
+// gdb-check:$2 = evec_in_struct::NoPadding2 {x: [6, 7, 8], y: [[9, 10], [11, 12]]}
 
 // gdb-command:print struct_internal_padding
-// gdbr-check:$3 = evec_in_struct::StructInternalPadding {x: [13, 14], y: [15, 16]}
+// gdb-check:$3 = evec_in_struct::StructInternalPadding {x: [13, 14], y: [15, 16]}
 
 // gdb-command:print single_vec
-// gdbr-check:$4 = evec_in_struct::SingleVec {x: [17, 18, 19, 20, 21]}
+// gdb-check:$4 = evec_in_struct::SingleVec {x: [17, 18, 19, 20, 21]}
 
 // gdb-command:print struct_padded_at_end
-// gdbr-check:$5 = evec_in_struct::StructPaddedAtEnd {x: [22, 23], y: [24, 25]}
+// gdb-check:$5 = evec_in_struct::StructPaddedAtEnd {x: [22, 23], y: [24, 25]}
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/gdb-pretty-struct-and-enums.rs

@@ -7,19 +7,19 @@
 // gdb-command: run
 
 // gdb-command: print regular_struct
-// gdbr-check:$1 = gdb_pretty_struct_and_enums::RegularStruct {the_first_field: 101, the_second_field: 102.5, the_third_field: false}
+// gdb-check:$1 = gdb_pretty_struct_and_enums::RegularStruct {the_first_field: 101, the_second_field: 102.5, the_third_field: false}
 
 // gdb-command: print empty_struct
-// gdbr-check:$2 = gdb_pretty_struct_and_enums::EmptyStruct
+// gdb-check:$2 = gdb_pretty_struct_and_enums::EmptyStruct
 
 // gdb-command: print c_style_enum1
-// gdbr-check:$3 = gdb_pretty_struct_and_enums::CStyleEnum::CStyleEnumVar1
+// gdb-check:$3 = gdb_pretty_struct_and_enums::CStyleEnum::CStyleEnumVar1
 
 // gdb-command: print c_style_enum2
-// gdbr-check:$4 = gdb_pretty_struct_and_enums::CStyleEnum::CStyleEnumVar2
+// gdb-check:$4 = gdb_pretty_struct_and_enums::CStyleEnum::CStyleEnumVar2
 
 // gdb-command: print c_style_enum3
-// gdbr-check:$5 = gdb_pretty_struct_and_enums::CStyleEnum::CStyleEnumVar3
+// gdb-check:$5 = gdb_pretty_struct_and_enums::CStyleEnum::CStyleEnumVar3
 
 #![allow(dead_code, unused_variables)]
 

tests/debuginfo/generic-enum-with-different-disr-sizes.rs

@@ -10,29 +10,29 @@
 // gdb-command:run
 
 // gdb-command:print eight_bytes1
-// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum<f64>::Variant1(100)
+// gdb-check:$1 = generic_enum_with_different_disr_sizes::Enum<f64>::Variant1(100)
 
 // gdb-command:print four_bytes1
-// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum<i32>::Variant1(101)
+// gdb-check:$2 = generic_enum_with_different_disr_sizes::Enum<i32>::Variant1(101)
 
 // gdb-command:print two_bytes1
-// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum<i16>::Variant1(102)
+// gdb-check:$3 = generic_enum_with_different_disr_sizes::Enum<i16>::Variant1(102)
 
 // gdb-command:print one_byte1
-// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum<u8>::Variant1(65)
+// gdb-check:$4 = generic_enum_with_different_disr_sizes::Enum<u8>::Variant1(65)
 
 
 // gdb-command:print eight_bytes2
-// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum<f64>::Variant2(100)
+// gdb-check:$5 = generic_enum_with_different_disr_sizes::Enum<f64>::Variant2(100)
 
 // gdb-command:print four_bytes2
-// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum<i32>::Variant2(101)
+// gdb-check:$6 = generic_enum_with_different_disr_sizes::Enum<i32>::Variant2(101)
 
 // gdb-command:print two_bytes2
-// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum<i16>::Variant2(102)
+// gdb-check:$7 = generic_enum_with_different_disr_sizes::Enum<i16>::Variant2(102)
 
 // gdb-command:print one_byte2
-// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum<u8>::Variant2(65)
+// gdb-check:$8 = generic_enum_with_different_disr_sizes::Enum<u8>::Variant2(65)
 
 // gdb-command:continue
 

tests/debuginfo/generic-function.rs

@@ -21,7 +21,7 @@
 // gdb-command:print *t0
 // gdb-check:$5 = 5
 // gdb-command:print *t1
-// gdbr-check:$6 = generic_function::Struct {a: 6, b: 7.5}
+// gdb-check:$6 = generic_function::Struct {a: 6, b: 7.5}
 // gdb-command:continue
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/generic-method-on-generic-struct.rs

@@ -10,7 +10,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = generic_method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdb-check:$1 = generic_method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -19,7 +19,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = generic_method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdb-check:$4 = generic_method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -28,7 +28,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdb-check:$7 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -37,7 +37,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdb-check:$10 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -46,7 +46,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdb-check:$13 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/generic-struct-style-enum.rs

@@ -9,16 +9,16 @@
 // gdb-command:run
 
 // gdb-command:print case1
-// gdbr-check:$1 = generic_struct_style_enum::Regular<u16, u32, i64>::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868}
+// gdb-check:$1 = generic_struct_style_enum::Regular<u16, u32, i64>::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868}
 
 // gdb-command:print case2
-// gdbr-check:$2 = generic_struct_style_enum::Regular<i16, u32, i64>::Case2{a: 0, b: 286331153, c: 286331153}
+// gdb-check:$2 = generic_struct_style_enum::Regular<i16, u32, i64>::Case2{a: 0, b: 286331153, c: 286331153}
 
 // gdb-command:print case3
-// gdbr-check:$3 = generic_struct_style_enum::Regular<u16, i32, u64>::Case3{a: 0, b: 6438275382588823897}
+// gdb-check:$3 = generic_struct_style_enum::Regular<u16, i32, u64>::Case3{a: 0, b: 6438275382588823897}
 
 // gdb-command:print univariant
-// gdbr-check:$4 = generic_struct_style_enum::Univariant<i32>::TheOnlyCase{a: -1}
+// gdb-check:$4 = generic_struct_style_enum::Univariant<i32>::TheOnlyCase{a: -1}
 
 
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/generic-struct.rs

@@ -9,13 +9,13 @@
 // gdb-command:run
 
 // gdb-command:print int_int
-// gdbr-check:$1 = generic_struct::AGenericStruct<i32, i32> {key: 0, value: 1}
+// gdb-check:$1 = generic_struct::AGenericStruct<i32, i32> {key: 0, value: 1}
 // gdb-command:print int_float
-// gdbr-check:$2 = generic_struct::AGenericStruct<i32, f64> {key: 2, value: 3.5}
+// gdb-check:$2 = generic_struct::AGenericStruct<i32, f64> {key: 2, value: 3.5}
 // gdb-command:print float_int
-// gdbr-check:$3 = generic_struct::AGenericStruct<f64, i32> {key: 4.5, value: 5}
+// gdb-check:$3 = generic_struct::AGenericStruct<f64, i32> {key: 4.5, value: 5}
 // gdb-command:print float_int_float
-// gdbr-check:$4 = generic_struct::AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> {key: 6.5, value: generic_struct::AGenericStruct<i32, f64> {key: 7, value: 8.5}}
+// gdb-check:$4 = generic_struct::AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> {key: 6.5, value: generic_struct::AGenericStruct<i32, f64> {key: 7, value: 8.5}}
 
 // === LLDB TESTS ==================================================================================
 

tests/debuginfo/generic-tuple-style-enum.rs

@@ -10,16 +10,16 @@
 // gdb-command:run
 
 // gdb-command:print case1
-// gdbr-check:$1 = generic_tuple_style_enum::Regular<u16, u32, u64>::Case1(0, 31868, 31868, 31868, 31868)
+// gdb-check:$1 = generic_tuple_style_enum::Regular<u16, u32, u64>::Case1(0, 31868, 31868, 31868, 31868)
 
 // gdb-command:print case2
-// gdbr-check:$2 = generic_tuple_style_enum::Regular<i16, i32, i64>::Case2(0, 286331153, 286331153)
+// gdb-check:$2 = generic_tuple_style_enum::Regular<i16, i32, i64>::Case2(0, 286331153, 286331153)
 
 // gdb-command:print case3
-// gdbr-check:$3 = generic_tuple_style_enum::Regular<i16, i32, i64>::Case3(0, 6438275382588823897)
+// gdb-check:$3 = generic_tuple_style_enum::Regular<i16, i32, i64>::Case3(0, 6438275382588823897)
 
 // gdb-command:print univariant
-// gdbr-check:$4 = generic_tuple_style_enum::Univariant<i64>::TheOnlyCase(-1)
+// gdb-check:$4 = generic_tuple_style_enum::Univariant<i64>::TheOnlyCase(-1)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/lexical-scopes-in-block-expression.rs

@@ -6,7 +6,7 @@
 
 // gdb-command:run
 
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$1 = 0
 
 // STRUCT EXPRESSION
@@ -18,7 +18,7 @@
 
 // gdb-command:print val
 // gdb-check:$4 = 11
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$5 = 1
 // gdb-command:print ten
 // gdb-check:$6 = 10
@@ -39,7 +39,7 @@
 
 // gdb-command:print val
 // gdb-check:$11 = 12
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$12 = 2
 // gdb-command:print ten
 // gdb-check:$13 = 10
@@ -60,7 +60,7 @@
 
 // gdb-command:print val
 // gdb-check:$18 = 13
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$19 = 3
 // gdb-command:print ten
 // gdb-check:$20 = 10
@@ -81,7 +81,7 @@
 
 // gdb-command:print val
 // gdb-check:$25 = 14
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$26 = 4
 // gdb-command:print ten
 // gdb-check:$27 = 10
@@ -102,7 +102,7 @@
 
 // gdb-command:print val
 // gdb-check:$32 = 15
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$33 = 5
 // gdb-command:print ten
 // gdb-check:$34 = 10
@@ -123,7 +123,7 @@
 
 // gdb-command:print val
 // gdb-check:$39 = 16
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$40 = 6
 // gdb-command:print ten
 // gdb-check:$41 = 10
@@ -145,7 +145,7 @@
 
 // gdb-command:print val
 // gdb-check:$46 = 17
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$47 = 7
 // gdb-command:print ten
 // gdb-check:$48 = 10
@@ -166,7 +166,7 @@
 
 // gdb-command:print val
 // gdb-check:$53 = 18
-// gdbr-command:print lexical_scopes_in_block_expression::MUT_INT
+// gdb-command:print lexical_scopes_in_block_expression::MUT_INT
 // gdb-check:$54 = 8
 // gdb-command:print ten
 // gdb-check:$55 = 10

tests/debuginfo/limited-debuginfo.rs

@@ -4,10 +4,10 @@
 
 // Make sure functions have proper names
 // gdb-command:info functions
-// gdbr-check:fn limited_debuginfo::main();
+// gdb-check:fn limited_debuginfo::main();
-// gdbr-check:fn limited_debuginfo::some_function();
+// gdb-check:fn limited_debuginfo::some_function();
-// gdbr-check:fn limited_debuginfo::some_other_function();
+// gdb-check:fn limited_debuginfo::some_other_function();
-// gdbr-check:fn limited_debuginfo::zzz();
+// gdb-check:fn limited_debuginfo::zzz();
 
 // gdb-command:run
 

tests/debuginfo/method-on-enum.rs

@@ -9,7 +9,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = method_on_enum::Enum::Variant2(117901063)
+// gdb-check:$1 = method_on_enum::Enum::Variant2(117901063)
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -18,7 +18,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = method_on_enum::Enum::Variant2(117901063)
+// gdb-check:$4 = method_on_enum::Enum::Variant2(117901063)
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -27,7 +27,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
+// gdb-check:$7 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -36,7 +36,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
+// gdb-check:$10 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -45,7 +45,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
+// gdb-check:$13 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/method-on-generic-struct.rs

@@ -10,7 +10,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdb-check:$1 = method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -19,7 +19,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdb-check:$4 = method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -28,7 +28,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdb-check:$7 = method_on_generic_struct::Struct<f64> {x: 1234.5}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -37,7 +37,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdb-check:$10 = method_on_generic_struct::Struct<f64> {x: 1234.5}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -46,7 +46,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdb-check:$13 = method_on_generic_struct::Struct<f64> {x: 1234.5}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/method-on-struct.rs

@@ -8,7 +8,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = method_on_struct::Struct {x: 100}
+// gdb-check:$1 = method_on_struct::Struct {x: 100}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -17,7 +17,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = method_on_struct::Struct {x: 100}
+// gdb-check:$4 = method_on_struct::Struct {x: 100}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -26,7 +26,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = method_on_struct::Struct {x: 200}
+// gdb-check:$7 = method_on_struct::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -35,7 +35,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = method_on_struct::Struct {x: 200}
+// gdb-check:$10 = method_on_struct::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -44,7 +44,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = method_on_struct::Struct {x: 200}
+// gdb-check:$13 = method_on_struct::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/method-on-trait.rs

@@ -8,7 +8,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = method_on_trait::Struct {x: 100}
+// gdb-check:$1 = method_on_trait::Struct {x: 100}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -17,7 +17,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = method_on_trait::Struct {x: 100}
+// gdb-check:$4 = method_on_trait::Struct {x: 100}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -26,7 +26,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = method_on_trait::Struct {x: 200}
+// gdb-check:$7 = method_on_trait::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -35,7 +35,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = method_on_trait::Struct {x: 200}
+// gdb-check:$10 = method_on_trait::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -44,7 +44,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = method_on_trait::Struct {x: 200}
+// gdb-check:$13 = method_on_trait::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/method-on-tuple-struct.rs

@@ -8,7 +8,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = method_on_tuple_struct::TupleStruct (100, -100.5)
+// gdb-check:$1 = method_on_tuple_struct::TupleStruct (100, -100.5)
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -17,7 +17,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = method_on_tuple_struct::TupleStruct (100, -100.5)
+// gdb-check:$4 = method_on_tuple_struct::TupleStruct (100, -100.5)
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -26,7 +26,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = method_on_tuple_struct::TupleStruct (200, -200.5)
+// gdb-check:$7 = method_on_tuple_struct::TupleStruct (200, -200.5)
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -35,7 +35,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = method_on_tuple_struct::TupleStruct (200, -200.5)
+// gdb-check:$10 = method_on_tuple_struct::TupleStruct (200, -200.5)
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -44,7 +44,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = method_on_tuple_struct::TupleStruct (200, -200.5)
+// gdb-check:$13 = method_on_tuple_struct::TupleStruct (200, -200.5)
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/option-like-enum.rs

@@ -8,28 +8,28 @@
 // gdb-command:run
 
 // gdb-command:print some
-// gdbr-check:$1 = core::option::Option<&u32>::Some(0x12345678)
+// gdb-check:$1 = core::option::Option<&u32>::Some(0x12345678)
 
 // gdb-command:print none
-// gdbr-check:$2 = core::option::Option<&u32>::None
+// gdb-check:$2 = core::option::Option<&u32>::None
 
 // gdb-command:print full
-// gdbr-check:$3 = option_like_enum::MoreFields::Full(454545, 0x87654321, 9988)
+// gdb-check:$3 = option_like_enum::MoreFields::Full(454545, 0x87654321, 9988)
 
-// gdbr-command:print empty_gdb.discr
+// gdb-command:print empty_gdb.discr
 // gdb-check:$4 = (*mut isize) 0x1
 
 // gdb-command:print droid
-// gdbr-check:$5 = option_like_enum::NamedFields::Droid{id: 675675, range: 10000001, internals: 0x43218765}
+// gdb-check:$5 = option_like_enum::NamedFields::Droid{id: 675675, range: 10000001, internals: 0x43218765}
 
-// gdbr-command:print void_droid_gdb.internals
+// gdb-command:print void_droid_gdb.internals
 // gdb-check:$6 = (*mut isize) 0x1
 
 // gdb-command:print nested_non_zero_yep
-// gdbr-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...]})
+// gdb-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...]})
 
 // gdb-command:print nested_non_zero_nope
-// gdbr-check:$8 = option_like_enum::NestedNonZero::Nope
+// gdb-check:$8 = option_like_enum::NestedNonZero::Nope
 
 // gdb-command:continue
 

tests/debuginfo/packed-struct-with-destructor.rs

@@ -7,29 +7,29 @@
 // gdb-command:run
 
 // gdb-command:print packed
-// gdbr-check:$1 = packed_struct_with_destructor::Packed {x: 123, y: 234, z: 345}
+// gdb-check:$1 = packed_struct_with_destructor::Packed {x: 123, y: 234, z: 345}
 
 // gdb-command:print packedInPacked
-// gdbr-check:$2 = packed_struct_with_destructor::PackedInPacked {a: 1111, b: packed_struct_with_destructor::Packed {x: 2222, y: 3333, z: 4444}, c: 5555, d: packed_struct_with_destructor::Packed {x: 6666, y: 7777, z: 8888}}
+// gdb-check:$2 = packed_struct_with_destructor::PackedInPacked {a: 1111, b: packed_struct_with_destructor::Packed {x: 2222, y: 3333, z: 4444}, c: 5555, d: packed_struct_with_destructor::Packed {x: 6666, y: 7777, z: 8888}}
 
 // gdb-command:print packedInUnpacked
-// gdbr-check:$3 = packed_struct_with_destructor::PackedInUnpacked {a: -1111, b: packed_struct_with_destructor::Packed {x: -2222, y: -3333, z: -4444}, c: -5555, d: packed_struct_with_destructor::Packed {x: -6666, y: -7777, z: -8888}}
+// gdb-check:$3 = packed_struct_with_destructor::PackedInUnpacked {a: -1111, b: packed_struct_with_destructor::Packed {x: -2222, y: -3333, z: -4444}, c: -5555, d: packed_struct_with_destructor::Packed {x: -6666, y: -7777, z: -8888}}
 
 // gdb-command:print unpackedInPacked
-// gdbr-check:$4 = packed_struct_with_destructor::UnpackedInPacked {a: 987, b: packed_struct_with_destructor::Unpacked {x: 876, y: 765, z: 654}, c: packed_struct_with_destructor::Unpacked {x: 543, y: 432, z: 321}, d: 210}
+// gdb-check:$4 = packed_struct_with_destructor::UnpackedInPacked {a: 987, b: packed_struct_with_destructor::Unpacked {x: 876, y: 765, z: 654}, c: packed_struct_with_destructor::Unpacked {x: 543, y: 432, z: 321}, d: 210}
 
 
 // gdb-command:print packedInPackedWithDrop
-// gdbr-check:$5 = packed_struct_with_destructor::PackedInPackedWithDrop {a: 11, b: packed_struct_with_destructor::Packed {x: 22, y: 33, z: 44}, c: 55, d: packed_struct_with_destructor::Packed {x: 66, y: 77, z: 88}}
+// gdb-check:$5 = packed_struct_with_destructor::PackedInPackedWithDrop {a: 11, b: packed_struct_with_destructor::Packed {x: 22, y: 33, z: 44}, c: 55, d: packed_struct_with_destructor::Packed {x: 66, y: 77, z: 88}}
 
 // gdb-command:print packedInUnpackedWithDrop
-// gdbr-check:$6 = packed_struct_with_destructor::PackedInUnpackedWithDrop {a: -11, b: packed_struct_with_destructor::Packed {x: -22, y: -33, z: -44}, c: -55, d: packed_struct_with_destructor::Packed {x: -66, y: -77, z: -88}}
+// gdb-check:$6 = packed_struct_with_destructor::PackedInUnpackedWithDrop {a: -11, b: packed_struct_with_destructor::Packed {x: -22, y: -33, z: -44}, c: -55, d: packed_struct_with_destructor::Packed {x: -66, y: -77, z: -88}}
 
 // gdb-command:print unpackedInPackedWithDrop
-// gdbr-check:$7 = packed_struct_with_destructor::UnpackedInPackedWithDrop {a: 98, b: packed_struct_with_destructor::Unpacked {x: 87, y: 76, z: 65}, c: packed_struct_with_destructor::Unpacked {x: 54, y: 43, z: 32}, d: 21}
+// gdb-check:$7 = packed_struct_with_destructor::UnpackedInPackedWithDrop {a: 98, b: packed_struct_with_destructor::Unpacked {x: 87, y: 76, z: 65}, c: packed_struct_with_destructor::Unpacked {x: 54, y: 43, z: 32}, d: 21}
 
 // gdb-command:print deeplyNested
-// gdbr-check:$8 = packed_struct_with_destructor::DeeplyNested {a: packed_struct_with_destructor::PackedInPacked {a: 1, b: packed_struct_with_destructor::Packed {x: 2, y: 3, z: 4}, c: 5, d: packed_struct_with_destructor::Packed {x: 6, y: 7, z: 8}}, b: packed_struct_with_destructor::UnpackedInPackedWithDrop {a: 9, b: packed_struct_with_destructor::Unpacked {x: 10, y: 11, z: 12}, c: packed_struct_with_destructor::Unpacked {x: 13, y: 14, z: 15}, d: 16}, c: packed_struct_with_destructor::PackedInUnpacked {a: 17, b: packed_struct_with_destructor::Packed {x: 18, y: 19, z: 20}, c: 21, d: packed_struct_with_destructor::Packed {x: 22, y: 23, z: 24}}, d: packed_struct_with_destructor::PackedInUnpackedWithDrop {a: 25, b: packed_struct_with_destructor::Packed {x: 26, y: 27, z: 28}, c: 29, d: packed_struct_with_destructor::Packed {x: 30, y: 31, z: 32}}, e: packed_struct_with_destructor::UnpackedInPacked {a: 33, b: packed_struct_with_destructor::Unpacked {x: 34, y: 35, z: 36}, c: packed_struct_with_destructor::Unpacked {x: 37, y: 38, z: 39}, d: 40}, f: packed_struct_with_destructor::PackedInPackedWithDrop {a: 41, b: packed_struct_with_destructor::Packed {x: 42, y: 43, z: 44}, c: 45, d: packed_struct_with_destructor::Packed {x: 46, y: 47, z: 48}}}
+// gdb-check:$8 = packed_struct_with_destructor::DeeplyNested {a: packed_struct_with_destructor::PackedInPacked {a: 1, b: packed_struct_with_destructor::Packed {x: 2, y: 3, z: 4}, c: 5, d: packed_struct_with_destructor::Packed {x: 6, y: 7, z: 8}}, b: packed_struct_with_destructor::UnpackedInPackedWithDrop {a: 9, b: packed_struct_with_destructor::Unpacked {x: 10, y: 11, z: 12}, c: packed_struct_with_destructor::Unpacked {x: 13, y: 14, z: 15}, d: 16}, c: packed_struct_with_destructor::PackedInUnpacked {a: 17, b: packed_struct_with_destructor::Packed {x: 18, y: 19, z: 20}, c: 21, d: packed_struct_with_destructor::Packed {x: 22, y: 23, z: 24}}, d: packed_struct_with_destructor::PackedInUnpackedWithDrop {a: 25, b: packed_struct_with_destructor::Packed {x: 26, y: 27, z: 28}, c: 29, d: packed_struct_with_destructor::Packed {x: 30, y: 31, z: 32}}, e: packed_struct_with_destructor::UnpackedInPacked {a: 33, b: packed_struct_with_destructor::Unpacked {x: 34, y: 35, z: 36}, c: packed_struct_with_destructor::Unpacked {x: 37, y: 38, z: 39}, d: 40}, f: packed_struct_with_destructor::PackedInPackedWithDrop {a: 41, b: packed_struct_with_destructor::Packed {x: 42, y: 43, z: 44}, c: 45, d: packed_struct_with_destructor::Packed {x: 46, y: 47, z: 48}}}
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/packed-struct.rs

@@ -8,16 +8,16 @@
 // gdb-command:run
 
 // gdb-command:print packed
-// gdbr-check:$1 = packed_struct::Packed {x: 123, y: 234, z: 345}
+// gdb-check:$1 = packed_struct::Packed {x: 123, y: 234, z: 345}
 
 // gdb-command:print packedInPacked
-// gdbr-check:$2 = packed_struct::PackedInPacked {a: 1111, b: packed_struct::Packed {x: 2222, y: 3333, z: 4444}, c: 5555, d: packed_struct::Packed {x: 6666, y: 7777, z: 8888}}
+// gdb-check:$2 = packed_struct::PackedInPacked {a: 1111, b: packed_struct::Packed {x: 2222, y: 3333, z: 4444}, c: 5555, d: packed_struct::Packed {x: 6666, y: 7777, z: 8888}}
 
 // gdb-command:print packedInUnpacked
-// gdbr-check:$3 = packed_struct::PackedInUnpacked {a: -1111, b: packed_struct::Packed {x: -2222, y: -3333, z: -4444}, c: -5555, d: packed_struct::Packed {x: -6666, y: -7777, z: -8888}}
+// gdb-check:$3 = packed_struct::PackedInUnpacked {a: -1111, b: packed_struct::Packed {x: -2222, y: -3333, z: -4444}, c: -5555, d: packed_struct::Packed {x: -6666, y: -7777, z: -8888}}
 
 // gdb-command:print unpackedInPacked
-// gdbr-check:$4 = packed_struct::UnpackedInPacked {a: 987, b: packed_struct::Unpacked {x: 876, y: 765, z: 654, w: 543}, c: packed_struct::Unpacked {x: 432, y: 321, z: 210, w: 109}, d: -98}
+// gdb-check:$4 = packed_struct::UnpackedInPacked {a: 987, b: packed_struct::Unpacked {x: 876, y: 765, z: 654, w: 543}, c: packed_struct::Unpacked {x: 432, y: 321, z: 210, w: 109}, d: -98}
 
 // gdb-command:print sizeof(packed)
 // gdb-check:$5 = 14

tests/debuginfo/pretty-slices.rs

@@ -5,10 +5,10 @@
 // gdb-command: run
 
 // gdb-command: print slice
-// gdbr-check: $1 = &[i32](size=3) = {0, 1, 2}
+// gdb-check: $1 = &[i32](size=3) = {0, 1, 2}
 
 // gdb-command: print mut_slice
-// gdbr-check: $2 = &mut [i32](size=4) = {2, 3, 5, 7}
+// gdb-check: $2 = &mut [i32](size=4) = {2, 3, 5, 7}
 
 // gdb-command: print str_slice
 // gdb-check: $3 = "string slice"

tests/debuginfo/pretty-std.rs

@@ -26,7 +26,7 @@
 // gdb-check:$5 = core::option::Option<i16>::Some(8)
 
 // gdb-command: print none
-// gdbr-check:$6 = core::option::Option<i64>::None
+// gdb-check:$6 = core::option::Option<i64>::None
 
 // gdb-command: print os_string
 // gdb-check:$7 = "IAMA OS string 😃"

tests/debuginfo/recursive-struct.rs

@@ -9,53 +9,53 @@
 
 // gdb-command:print stack_unique.value
 // gdb-check:$1 = 0
-// gdbr-command:print stack_unique.next.val.value
+// gdb-command:print stack_unique.next.val.value
 // gdb-check:$2 = 1
 
-// gdbr-command:print unique_unique.value
+// gdb-command:print unique_unique.value
 // gdb-check:$3 = 2
-// gdbr-command:print unique_unique.next.val.value
+// gdb-command:print unique_unique.next.val.value
 // gdb-check:$4 = 3
 
 // gdb-command:print vec_unique[0].value
 // gdb-check:$5 = 6.5
-// gdbr-command:print vec_unique[0].next.val.value
+// gdb-command:print vec_unique[0].next.val.value
 // gdb-check:$6 = 7.5
 
-// gdbr-command:print borrowed_unique.value
+// gdb-command:print borrowed_unique.value
 // gdb-check:$7 = 8.5
-// gdbr-command:print borrowed_unique.next.val.value
+// gdb-command:print borrowed_unique.next.val.value
 // gdb-check:$8 = 9.5
 
 // LONG CYCLE
 // gdb-command:print long_cycle1.value
 // gdb-check:$9 = 20
-// gdbr-command:print long_cycle1.next.value
+// gdb-command:print long_cycle1.next.value
 // gdb-check:$10 = 21
-// gdbr-command:print long_cycle1.next.next.value
+// gdb-command:print long_cycle1.next.next.value
 // gdb-check:$11 = 22
-// gdbr-command:print long_cycle1.next.next.next.value
+// gdb-command:print long_cycle1.next.next.next.value
 // gdb-check:$12 = 23
 
 // gdb-command:print long_cycle2.value
 // gdb-check:$13 = 24
-// gdbr-command:print long_cycle2.next.value
+// gdb-command:print long_cycle2.next.value
 // gdb-check:$14 = 25
-// gdbr-command:print long_cycle2.next.next.value
+// gdb-command:print long_cycle2.next.next.value
 // gdb-check:$15 = 26
 
 // gdb-command:print long_cycle3.value
 // gdb-check:$16 = 27
-// gdbr-command:print long_cycle3.next.value
+// gdb-command:print long_cycle3.next.value
 // gdb-check:$17 = 28
 
 // gdb-command:print long_cycle4.value
 // gdb-check:$18 = 29.5
 
-// gdbr-command:print long_cycle_w_anon_types.value
+// gdb-command:print long_cycle_w_anon_types.value
 // gdb-check:$19 = 30
 
-// gdbr-command:print long_cycle_w_anon_types.next.val.value
+// gdb-command:print long_cycle_w_anon_types.next.val.value
 // gdb-check:$20 = 31
 
 // gdb-command:continue

tests/debuginfo/reference-debuginfo.rs

@@ -18,7 +18,7 @@
 // gdb-check:$3 = 97
 
 // gdb-command:print *i8_ref
-// gdbr-check:$4 = 68
+// gdb-check:$4 = 68
 
 // gdb-command:print *i16_ref
 // gdb-check:$5 = -16
@@ -33,7 +33,7 @@
 // gdb-check:$8 = 1
 
 // gdb-command:print *u8_ref
-// gdbr-check:$9 = 100
+// gdb-check:$9 = 100
 
 // gdb-command:print *u16_ref
 // gdb-check:$10 = 16

tests/debuginfo/self-in-default-method.rs

@@ -8,7 +8,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = self_in_default_method::Struct {x: 100}
+// gdb-check:$1 = self_in_default_method::Struct {x: 100}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -17,7 +17,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = self_in_default_method::Struct {x: 100}
+// gdb-check:$4 = self_in_default_method::Struct {x: 100}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -26,7 +26,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = self_in_default_method::Struct {x: 200}
+// gdb-check:$7 = self_in_default_method::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -35,7 +35,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = self_in_default_method::Struct {x: 200}
+// gdb-check:$10 = self_in_default_method::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -44,7 +44,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = self_in_default_method::Struct {x: 200}
+// gdb-check:$13 = self_in_default_method::Struct {x: 200}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/self-in-generic-default-method.rs

@@ -8,7 +8,7 @@
 
 // STACK BY REF
 // gdb-command:print *self
-// gdbr-check:$1 = self_in_generic_default_method::Struct {x: 987}
+// gdb-check:$1 = self_in_generic_default_method::Struct {x: 987}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -17,7 +17,7 @@
 
 // STACK BY VAL
 // gdb-command:print self
-// gdbr-check:$4 = self_in_generic_default_method::Struct {x: 987}
+// gdb-check:$4 = self_in_generic_default_method::Struct {x: 987}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -26,7 +26,7 @@
 
 // OWNED BY REF
 // gdb-command:print *self
-// gdbr-check:$7 = self_in_generic_default_method::Struct {x: 879}
+// gdb-check:$7 = self_in_generic_default_method::Struct {x: 879}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -35,7 +35,7 @@
 
 // OWNED BY VAL
 // gdb-command:print self
-// gdbr-check:$10 = self_in_generic_default_method::Struct {x: 879}
+// gdb-check:$10 = self_in_generic_default_method::Struct {x: 879}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -44,7 +44,7 @@
 
 // OWNED MOVED
 // gdb-command:print *self
-// gdbr-check:$13 = self_in_generic_default_method::Struct {x: 879}
+// gdb-check:$13 = self_in_generic_default_method::Struct {x: 879}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2

tests/debuginfo/simd.rs

@@ -9,28 +9,28 @@
 //@ compile-flags:-g
 // gdb-command:run
 
-// gdbr-command:print vi8x16
+// gdb-command:print vi8x16
-// gdbr-check:$1 = simd::i8x16 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)
+// gdb-check:$1 = simd::i8x16 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)
-// gdbr-command:print vi16x8
+// gdb-command:print vi16x8
-// gdbr-check:$2 = simd::i16x8 (16, 17, 18, 19, 20, 21, 22, 23)
+// gdb-check:$2 = simd::i16x8 (16, 17, 18, 19, 20, 21, 22, 23)
-// gdbr-command:print vi32x4
+// gdb-command:print vi32x4
-// gdbr-check:$3 = simd::i32x4 (24, 25, 26, 27)
+// gdb-check:$3 = simd::i32x4 (24, 25, 26, 27)
-// gdbr-command:print vi64x2
+// gdb-command:print vi64x2
-// gdbr-check:$4 = simd::i64x2 (28, 29)
+// gdb-check:$4 = simd::i64x2 (28, 29)
 
-// gdbr-command:print vu8x16
+// gdb-command:print vu8x16
-// gdbr-check:$5 = simd::u8x16 (30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45)
+// gdb-check:$5 = simd::u8x16 (30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45)
-// gdbr-command:print vu16x8
+// gdb-command:print vu16x8
-// gdbr-check:$6 = simd::u16x8 (46, 47, 48, 49, 50, 51, 52, 53)
+// gdb-check:$6 = simd::u16x8 (46, 47, 48, 49, 50, 51, 52, 53)
-// gdbr-command:print vu32x4
+// gdb-command:print vu32x4
-// gdbr-check:$7 = simd::u32x4 (54, 55, 56, 57)
+// gdb-check:$7 = simd::u32x4 (54, 55, 56, 57)
-// gdbr-command:print vu64x2
+// gdb-command:print vu64x2
-// gdbr-check:$8 = simd::u64x2 (58, 59)
+// gdb-check:$8 = simd::u64x2 (58, 59)
 
 // gdb-command:print vf32x4
-// gdbr-check:$9 = simd::f32x4 (60.5, 61.5, 62.5, 63.5)
+// gdb-check:$9 = simd::f32x4 (60.5, 61.5, 62.5, 63.5)
 // gdb-command:print vf64x2
-// gdbr-check:$10 = simd::f64x2 (64.5, 65.5)
+// gdb-check:$10 = simd::f64x2 (64.5, 65.5)
 
 // gdb-command:continue
 

tests/debuginfo/simple-struct.rs

@@ -4,61 +4,61 @@
 
 // === GDB TESTS ===================================================================================
 
-// gdbr-command:print simple_struct::NO_PADDING_16
+// gdb-command:print simple_struct::NO_PADDING_16
-// gdbr-check:$1 = simple_struct::NoPadding16 {x: 1000, y: -1001}
+// gdb-check:$1 = simple_struct::NoPadding16 {x: 1000, y: -1001}
 
-// gdbr-command:print simple_struct::NO_PADDING_32
+// gdb-command:print simple_struct::NO_PADDING_32
-// gdbr-check:$2 = simple_struct::NoPadding32 {x: 1, y: 2, z: 3}
+// gdb-check:$2 = simple_struct::NoPadding32 {x: 1, y: 2, z: 3}
 
-// gdbr-command:print simple_struct::NO_PADDING_64
+// gdb-command:print simple_struct::NO_PADDING_64
-// gdbr-check:$3 = simple_struct::NoPadding64 {x: 4, y: 5, z: 6}
+// gdb-check:$3 = simple_struct::NoPadding64 {x: 4, y: 5, z: 6}
 
-// gdbr-command:print simple_struct::NO_PADDING_163264
+// gdb-command:print simple_struct::NO_PADDING_163264
-// gdbr-check:$4 = simple_struct::NoPadding163264 {a: 7, b: 8, c: 9, d: 10}
+// gdb-check:$4 = simple_struct::NoPadding163264 {a: 7, b: 8, c: 9, d: 10}
 
-// gdbr-command:print simple_struct::INTERNAL_PADDING
+// gdb-command:print simple_struct::INTERNAL_PADDING
-// gdbr-check:$5 = simple_struct::InternalPadding {x: 11, y: 12}
+// gdb-check:$5 = simple_struct::InternalPadding {x: 11, y: 12}
 
-// gdbr-command:print simple_struct::PADDING_AT_END
+// gdb-command:print simple_struct::PADDING_AT_END
-// gdbr-check:$6 = simple_struct::PaddingAtEnd {x: 13, y: 14}
+// gdb-check:$6 = simple_struct::PaddingAtEnd {x: 13, y: 14}
 
 // gdb-command:run
 
 // gdb-command:print no_padding16
-// gdbr-check:$7 = simple_struct::NoPadding16 {x: 10000, y: -10001}
+// gdb-check:$7 = simple_struct::NoPadding16 {x: 10000, y: -10001}
 
 // gdb-command:print no_padding32
-// gdbr-check:$8 = simple_struct::NoPadding32 {x: -10002, y: -10003.5, z: 10004}
+// gdb-check:$8 = simple_struct::NoPadding32 {x: -10002, y: -10003.5, z: 10004}
 
 // gdb-command:print no_padding64
-// gdbr-check:$9 = simple_struct::NoPadding64 {x: -10005.5, y: 10006, z: 10007}
+// gdb-check:$9 = simple_struct::NoPadding64 {x: -10005.5, y: 10006, z: 10007}
 
 // gdb-command:print no_padding163264
-// gdbr-check:$10 = simple_struct::NoPadding163264 {a: -10008, b: 10009, c: 10010, d: 10011}
+// gdb-check:$10 = simple_struct::NoPadding163264 {a: -10008, b: 10009, c: 10010, d: 10011}
 
 // gdb-command:print internal_padding
-// gdbr-check:$11 = simple_struct::InternalPadding {x: 10012, y: -10013}
+// gdb-check:$11 = simple_struct::InternalPadding {x: 10012, y: -10013}
 
 // gdb-command:print padding_at_end
-// gdbr-check:$12 = simple_struct::PaddingAtEnd {x: -10014, y: 10015}
+// gdb-check:$12 = simple_struct::PaddingAtEnd {x: -10014, y: 10015}
 
-// gdbr-command:print simple_struct::NO_PADDING_16
+// gdb-command:print simple_struct::NO_PADDING_16
-// gdbr-check:$13 = simple_struct::NoPadding16 {x: 100, y: -101}
+// gdb-check:$13 = simple_struct::NoPadding16 {x: 100, y: -101}
 
-// gdbr-command:print simple_struct::NO_PADDING_32
+// gdb-command:print simple_struct::NO_PADDING_32
-// gdbr-check:$14 = simple_struct::NoPadding32 {x: -15, y: -16, z: 17}
+// gdb-check:$14 = simple_struct::NoPadding32 {x: -15, y: -16, z: 17}
 
-// gdbr-command:print simple_struct::NO_PADDING_64
+// gdb-command:print simple_struct::NO_PADDING_64
-// gdbr-check:$15 = simple_struct::NoPadding64 {x: -18, y: 19, z: 20}
+// gdb-check:$15 = simple_struct::NoPadding64 {x: -18, y: 19, z: 20}
 
-// gdbr-command:print simple_struct::NO_PADDING_163264
+// gdb-command:print simple_struct::NO_PADDING_163264
-// gdbr-check:$16 = simple_struct::NoPadding163264 {a: -21, b: 22, c: 23, d: 24}
+// gdb-check:$16 = simple_struct::NoPadding163264 {a: -21, b: 22, c: 23, d: 24}
 
-// gdbr-command:print simple_struct::INTERNAL_PADDING
+// gdb-command:print simple_struct::INTERNAL_PADDING
-// gdbr-check:$17 = simple_struct::InternalPadding {x: 25, y: -26}
+// gdb-check:$17 = simple_struct::InternalPadding {x: 25, y: -26}
 
-// gdbr-command:print simple_struct::PADDING_AT_END
+// gdb-command:print simple_struct::PADDING_AT_END
-// gdbr-check:$18 = simple_struct::PaddingAtEnd {x: -27, y: 28}
+// gdb-check:$18 = simple_struct::PaddingAtEnd {x: -27, y: 28}
 
 // gdb-command:continue
 

tests/debuginfo/simple-tuple.rs

@@ -4,58 +4,58 @@
 
 // === GDB TESTS ===================================================================================
 
-// gdbr-command:print simple_tuple::NO_PADDING_8
+// gdb-command:print simple_tuple::NO_PADDING_8
-// gdbr-check:$1 = (-50, 50)
+// gdb-check:$1 = (-50, 50)
-// gdbr-command:print simple_tuple::NO_PADDING_16
+// gdb-command:print simple_tuple::NO_PADDING_16
-// gdbr-check:$2 = (-1, 2, 3)
+// gdb-check:$2 = (-1, 2, 3)
-// gdbr-command:print simple_tuple::NO_PADDING_32
+// gdb-command:print simple_tuple::NO_PADDING_32
-// gdbr-check:$3 = (4, 5, 6)
+// gdb-check:$3 = (4, 5, 6)
-// gdbr-command:print simple_tuple::NO_PADDING_64
+// gdb-command:print simple_tuple::NO_PADDING_64
-// gdbr-check:$4 = (7, 8, 9)
+// gdb-check:$4 = (7, 8, 9)
 
-// gdbr-command:print simple_tuple::INTERNAL_PADDING_1
+// gdb-command:print simple_tuple::INTERNAL_PADDING_1
-// gdbr-check:$5 = (10, 11)
+// gdb-check:$5 = (10, 11)
-// gdbr-command:print simple_tuple::INTERNAL_PADDING_2
+// gdb-command:print simple_tuple::INTERNAL_PADDING_2
-// gdbr-check:$6 = (12, 13, 14, 15)
+// gdb-check:$6 = (12, 13, 14, 15)
 
-// gdbr-command:print simple_tuple::PADDING_AT_END
+// gdb-command:print simple_tuple::PADDING_AT_END
-// gdbr-check:$7 = (16, 17)
+// gdb-check:$7 = (16, 17)
 
 // gdb-command:run
 
-// gdbr-command:print noPadding8
+// gdb-command:print noPadding8
-// gdbr-check:$8 = (-100, 100)
+// gdb-check:$8 = (-100, 100)
 // gdb-command:print noPadding16
-// gdbr-check:$9 = (0, 1, 2)
+// gdb-check:$9 = (0, 1, 2)
 // gdb-command:print noPadding32
-// gdbr-check:$10 = (3, 4.5, 5)
+// gdb-check:$10 = (3, 4.5, 5)
 // gdb-command:print noPadding64
-// gdbr-check:$11 = (6, 7.5, 8)
+// gdb-check:$11 = (6, 7.5, 8)
 
 // gdb-command:print internalPadding1
-// gdbr-check:$12 = (9, 10)
+// gdb-check:$12 = (9, 10)
 // gdb-command:print internalPadding2
-// gdbr-check:$13 = (11, 12, 13, 14)
+// gdb-check:$13 = (11, 12, 13, 14)
 
 // gdb-command:print paddingAtEnd
-// gdbr-check:$14 = (15, 16)
+// gdb-check:$14 = (15, 16)
 
-// gdbr-command:print simple_tuple::NO_PADDING_8
+// gdb-command:print simple_tuple::NO_PADDING_8
-// gdbr-check:$15 = (-127, 127)
+// gdb-check:$15 = (-127, 127)
-// gdbr-command:print simple_tuple::NO_PADDING_16
+// gdb-command:print simple_tuple::NO_PADDING_16
-// gdbr-check:$16 = (-10, 10, 9)
+// gdb-check:$16 = (-10, 10, 9)
-// gdbr-command:print simple_tuple::NO_PADDING_32
+// gdb-command:print simple_tuple::NO_PADDING_32
-// gdbr-check:$17 = (14, 15, 16)
+// gdb-check:$17 = (14, 15, 16)
-// gdbr-command:print simple_tuple::NO_PADDING_64
+// gdb-command:print simple_tuple::NO_PADDING_64
-// gdbr-check:$18 = (17, 18, 19)
+// gdb-check:$18 = (17, 18, 19)
 
-// gdbr-command:print simple_tuple::INTERNAL_PADDING_1
+// gdb-command:print simple_tuple::INTERNAL_PADDING_1
-// gdbr-check:$19 = (110, 111)
+// gdb-check:$19 = (110, 111)
-// gdbr-command:print simple_tuple::INTERNAL_PADDING_2
+// gdb-command:print simple_tuple::INTERNAL_PADDING_2
-// gdbr-check:$20 = (112, 113, 114, 115)
+// gdb-check:$20 = (112, 113, 114, 115)
 
-// gdbr-command:print simple_tuple::PADDING_AT_END
+// gdb-command:print simple_tuple::PADDING_AT_END
-// gdbr-check:$21 = (116, 117)
+// gdb-check:$21 = (116, 117)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/strings-and-strs.rs

@@ -7,19 +7,19 @@
 // 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> {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: alloc::raw_vec::Cap (5), alloc: alloc::alloc::Global}, _marker: core::marker::PhantomData<u8>}, len: 5}}
+// 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: alloc::raw_vec::Cap (5), alloc: alloc::alloc::Global}, _marker: core::marker::PhantomData<u8>}, len: 5}}
 
 // gdb-command:print plain_str
-// gdbr-check:$2 = "Hello"
+// gdb-check:$2 = "Hello"
 
 // gdb-command:print str_in_struct
-// gdbr-check:$3 = strings_and_strs::Foo {inner: "Hello"}
+// gdb-check:$3 = strings_and_strs::Foo {inner: "Hello"}
 
 // gdb-command:print str_in_tuple
-// gdbr-check:$4 = ("Hello", "World")
+// gdb-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: 0x[...]}, phantom: core::marker::PhantomData<alloc::rc::RcBox<&str>>, alloc: alloc::alloc::Global}
+// gdb-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 ==================================================================================

tests/debuginfo/struct-in-enum.rs

@@ -9,13 +9,13 @@
 // gdb-command:run
 
 // gdb-command:print case1
-// gdbr-check:$1 = struct_in_enum::Regular::Case1(0, struct_in_enum::Struct {x: 2088533116, y: 2088533116, z: 31868})
+// gdb-check:$1 = struct_in_enum::Regular::Case1(0, struct_in_enum::Struct {x: 2088533116, y: 2088533116, z: 31868})
 
 // gdb-command:print case2
-// gdbr-check:$2 = struct_in_enum::Regular::Case2(0, 1229782938247303441, 4369)
+// gdb-check:$2 = struct_in_enum::Regular::Case2(0, 1229782938247303441, 4369)
 
 // gdb-command:print univariant
-// gdbr-check:$3 = struct_in_enum::Univariant::TheOnlyCase(struct_in_enum::Struct {x: 123, y: 456, z: 789})
+// gdb-check:$3 = struct_in_enum::Univariant::TheOnlyCase(struct_in_enum::Struct {x: 123, y: 456, z: 789})
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/struct-in-struct.rs

@@ -7,13 +7,13 @@
 // gdb-command:run
 
 // gdb-command:print three_simple_structs
-// gdbr-check:$1 = struct_in_struct::ThreeSimpleStructs {x: struct_in_struct::Simple {x: 1}, y: struct_in_struct::Simple {x: 2}, z: struct_in_struct::Simple {x: 3}}
+// gdb-check:$1 = struct_in_struct::ThreeSimpleStructs {x: struct_in_struct::Simple {x: 1}, y: struct_in_struct::Simple {x: 2}, z: struct_in_struct::Simple {x: 3}}
 
 // gdb-command:print internal_padding_parent
-// gdbr-check:$2 = struct_in_struct::InternalPaddingParent {x: struct_in_struct::InternalPadding {x: 4, y: 5}, y: struct_in_struct::InternalPadding {x: 6, y: 7}, z: struct_in_struct::InternalPadding {x: 8, y: 9}}
+// gdb-check:$2 = struct_in_struct::InternalPaddingParent {x: struct_in_struct::InternalPadding {x: 4, y: 5}, y: struct_in_struct::InternalPadding {x: 6, y: 7}, z: struct_in_struct::InternalPadding {x: 8, y: 9}}
 
 // gdb-command:print padding_at_end_parent
-// gdbr-check:$3 = struct_in_struct::PaddingAtEndParent {x: struct_in_struct::PaddingAtEnd {x: 10, y: 11}, y: struct_in_struct::PaddingAtEnd {x: 12, y: 13}, z: struct_in_struct::PaddingAtEnd {x: 14, y: 15}}
+// gdb-check:$3 = struct_in_struct::PaddingAtEndParent {x: struct_in_struct::PaddingAtEnd {x: 10, y: 11}, y: struct_in_struct::PaddingAtEnd {x: 12, y: 13}, z: struct_in_struct::PaddingAtEnd {x: 14, y: 15}}
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/struct-style-enum.rs

@@ -9,16 +9,16 @@
 // gdb-command:run
 
 // gdb-command:print case1
-// gdbr-check:$1 = struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868}
+// gdb-check:$1 = struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868}
 
 // gdb-command:print case2
-// gdbr-check:$2 = struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153}
+// gdb-check:$2 = struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153}
 
 // gdb-command:print case3
-// gdbr-check:$3 = struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897}
+// gdb-check:$3 = struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897}
 
 // gdb-command:print univariant
-// gdbr-check:$4 = struct_style_enum::Univariant::TheOnlyCase{a: -1}
+// gdb-check:$4 = struct_style_enum::Univariant::TheOnlyCase{a: -1}
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/struct-with-destructor.rs

@@ -6,16 +6,16 @@
 
 // gdb-command:run
 // gdb-command:print simple
-// gdbr-check:$1 = struct_with_destructor::WithDestructor {x: 10, y: 20}
+// gdb-check:$1 = struct_with_destructor::WithDestructor {x: 10, y: 20}
 
 // gdb-command:print noDestructor
-// gdbr-check:$2 = struct_with_destructor::NoDestructorGuarded {a: struct_with_destructor::NoDestructor {x: 10, y: 20}, guard: -1}
+// gdb-check:$2 = struct_with_destructor::NoDestructorGuarded {a: struct_with_destructor::NoDestructor {x: 10, y: 20}, guard: -1}
 
 // gdb-command:print withDestructor
-// gdbr-check:$3 = struct_with_destructor::WithDestructorGuarded {a: struct_with_destructor::WithDestructor {x: 10, y: 20}, guard: -1}
+// gdb-check:$3 = struct_with_destructor::WithDestructorGuarded {a: struct_with_destructor::WithDestructor {x: 10, y: 20}, guard: -1}
 
 // gdb-command:print nested
-// gdbr-check:$4 = struct_with_destructor::NestedOuter {a: struct_with_destructor::NestedInner {a: struct_with_destructor::WithDestructor {x: 7890, y: 9870}}}
+// gdb-check:$4 = struct_with_destructor::NestedOuter {a: struct_with_destructor::NestedInner {a: struct_with_destructor::WithDestructor {x: 7890, y: 9870}}}
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/tuple-in-struct.rs

@@ -5,29 +5,29 @@
 // gdb-command:run
 
 // gdb-command:print no_padding1
-// gdbr-check:$1 = tuple_in_struct::NoPadding1 {x: (0, 1), y: 2, z: (3, 4, 5)}
+// gdb-check:$1 = tuple_in_struct::NoPadding1 {x: (0, 1), y: 2, z: (3, 4, 5)}
 // gdb-command:print no_padding2
-// gdbr-check:$2 = tuple_in_struct::NoPadding2 {x: (6, 7), y: ((8, 9), 10)}
+// gdb-check:$2 = tuple_in_struct::NoPadding2 {x: (6, 7), y: ((8, 9), 10)}
 
 // gdb-command:print tuple_internal_padding
-// gdbr-check:$3 = tuple_in_struct::TupleInternalPadding {x: (11, 12), y: (13, 14)}
+// gdb-check:$3 = tuple_in_struct::TupleInternalPadding {x: (11, 12), y: (13, 14)}
 // gdb-command:print struct_internal_padding
-// gdbr-check:$4 = tuple_in_struct::StructInternalPadding {x: (15, 16), y: (17, 18)}
+// gdb-check:$4 = tuple_in_struct::StructInternalPadding {x: (15, 16), y: (17, 18)}
 // gdb-command:print both_internally_padded
-// gdbr-check:$5 = tuple_in_struct::BothInternallyPadded {x: (19, 20, 21), y: (22, 23)}
+// gdb-check:$5 = tuple_in_struct::BothInternallyPadded {x: (19, 20, 21), y: (22, 23)}
 
 // gdb-command:print single_tuple
-// gdbr-check:$6 = tuple_in_struct::SingleTuple {x: (24, 25, 26)}
+// gdb-check:$6 = tuple_in_struct::SingleTuple {x: (24, 25, 26)}
 
 // gdb-command:print tuple_padded_at_end
-// gdbr-check:$7 = tuple_in_struct::TuplePaddedAtEnd {x: (27, 28), y: (29, 30)}
+// gdb-check:$7 = tuple_in_struct::TuplePaddedAtEnd {x: (27, 28), y: (29, 30)}
 // gdb-command:print struct_padded_at_end
-// gdbr-check:$8 = tuple_in_struct::StructPaddedAtEnd {x: (31, 32), y: (33, 34)}
+// gdb-check:$8 = tuple_in_struct::StructPaddedAtEnd {x: (31, 32), y: (33, 34)}
 // gdb-command:print both_padded_at_end
-// gdbr-check:$9 = tuple_in_struct::BothPaddedAtEnd {x: (35, 36, 37), y: (38, 39)}
+// gdb-check:$9 = tuple_in_struct::BothPaddedAtEnd {x: (35, 36, 37), y: (38, 39)}
 
 // gdb-command:print mixed_padding
-// gdbr-check:$10 = tuple_in_struct::MixedPadding {x: ((40, 41, 42), (43, 44)), y: (45, 46, 47, 48)}
+// gdb-check:$10 = tuple_in_struct::MixedPadding {x: ((40, 41, 42), (43, 44)), y: (45, 46, 47, 48)}
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/tuple-in-tuple.rs

@@ -7,21 +7,21 @@
 // gdb-command:run
 
 // gdb-command:print no_padding1
-// gdbr-check:$1 = ((0, 1), 2, 3)
+// gdb-check:$1 = ((0, 1), 2, 3)
 // gdb-command:print no_padding2
-// gdbr-check:$2 = (4, (5, 6), 7)
+// gdb-check:$2 = (4, (5, 6), 7)
 // gdb-command:print no_padding3
-// gdbr-check:$3 = (8, 9, (10, 11))
+// gdb-check:$3 = (8, 9, (10, 11))
 
 // gdb-command:print internal_padding1
-// gdbr-check:$4 = (12, (13, 14))
+// gdb-check:$4 = (12, (13, 14))
 // gdb-command:print internal_padding2
-// gdbr-check:$5 = (15, (16, 17))
+// gdb-check:$5 = (15, (16, 17))
 
 // gdb-command:print padding_at_end1
-// gdbr-check:$6 = (18, (19, 20))
+// gdb-check:$6 = (18, (19, 20))
 // gdb-command:print padding_at_end2
-// gdbr-check:$7 = ((21, 22), 23)
+// gdb-check:$7 = ((21, 22), 23)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/tuple-struct.rs

@@ -7,22 +7,22 @@
 // gdb-command:run
 
 // gdb-command:print no_padding16
-// gdbr-check:$1 = tuple_struct::NoPadding16 (10000, -10001)
+// gdb-check:$1 = tuple_struct::NoPadding16 (10000, -10001)
 
 // gdb-command:print no_padding32
-// gdbr-check:$2 = tuple_struct::NoPadding32 (-10002, -10003.5, 10004)
+// gdb-check:$2 = tuple_struct::NoPadding32 (-10002, -10003.5, 10004)
 
 // gdb-command:print no_padding64
-// gdbr-check:$3 = tuple_struct::NoPadding64 (-10005.5, 10006, 10007)
+// gdb-check:$3 = tuple_struct::NoPadding64 (-10005.5, 10006, 10007)
 
 // gdb-command:print no_padding163264
-// gdbr-check:$4 = tuple_struct::NoPadding163264 (-10008, 10009, 10010, 10011)
+// gdb-check:$4 = tuple_struct::NoPadding163264 (-10008, 10009, 10010, 10011)
 
 // gdb-command:print internal_padding
-// gdbr-check:$5 = tuple_struct::InternalPadding (10012, -10013)
+// gdb-check:$5 = tuple_struct::InternalPadding (10012, -10013)
 
 // gdb-command:print padding_at_end
-// gdbr-check:$6 = tuple_struct::PaddingAtEnd (-10014, 10015)
+// gdb-check:$6 = tuple_struct::PaddingAtEnd (-10014, 10015)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/tuple-style-enum.rs

@@ -10,16 +10,16 @@
 // gdb-command:run
 
 // gdb-command:print case1
-// gdbr-check:$1 = tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868)
+// gdb-check:$1 = tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868)
 
 // gdb-command:print case2
-// gdbr-check:$2 = tuple_style_enum::Regular::Case2(0, 286331153, 286331153)
+// gdb-check:$2 = tuple_style_enum::Regular::Case2(0, 286331153, 286331153)
 
 // gdb-command:print case3
-// gdbr-check:$3 = tuple_style_enum::Regular::Case3(0, 6438275382588823897)
+// gdb-check:$3 = tuple_style_enum::Regular::Case3(0, 6438275382588823897)
 
 // gdb-command:print univariant
-// gdbr-check:$4 = tuple_style_enum::Univariant::TheOnlyCase(-1)
+// gdb-check:$4 = tuple_style_enum::Univariant::TheOnlyCase(-1)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/union-smoke.rs

@@ -8,9 +8,9 @@
 
 // gdb-command:run
 // gdb-command:print u
-// gdbr-check:$1 = union_smoke::U {a: (2, 2), b: 514}
+// gdb-check:$1 = union_smoke::U {a: (2, 2), b: 514}
 // gdb-command:print union_smoke::SU
-// gdbr-check:$2 = union_smoke::U {a: (1, 1), b: 257}
+// gdb-check:$2 = union_smoke::U {a: (1, 1), b: 257}
 
 // === LLDB TESTS ==================================================================================
 

tests/debuginfo/unique-enum.rs

@@ -9,13 +9,13 @@
 // gdb-command:run
 
 // gdb-command:print *the_a
-// gdbr-check:$1 = unique_enum::ABC::TheA{x: 0, y: 8970181431921507452}
+// gdb-check:$1 = unique_enum::ABC::TheA{x: 0, y: 8970181431921507452}
 
 // gdb-command:print *the_b
-// gdbr-check:$2 = unique_enum::ABC::TheB(0, 286331153, 286331153)
+// gdb-check:$2 = unique_enum::ABC::TheB(0, 286331153, 286331153)
 
 // gdb-command:print *univariant
-// gdbr-check:$3 = unique_enum::Univariant::TheOnlyCase(123234)
+// gdb-check:$3 = unique_enum::Univariant::TheOnlyCase(123234)
 
 
 // === LLDB TESTS ==================================================================================

tests/debuginfo/unsized.rs

@@ -7,22 +7,22 @@
 // gdb-command:run
 
 // gdb-command:print a
-// gdbr-check:$1 = &unsized::Foo<[u8]> {data_ptr: [...], length: 4}
+// gdb-check:$1 = &unsized::Foo<[u8]> {data_ptr: [...], length: 4}
 
 // gdb-command:print b
-// gdbr-check:$2 = &unsized::Foo<unsized::Foo<[u8]>> {data_ptr: [...], length: 4}
+// gdb-check:$2 = &unsized::Foo<unsized::Foo<[u8]>> {data_ptr: [...], length: 4}
 
 // gdb-command:print c
-// gdbr-check:$3 = &unsized::Foo<dyn core::fmt::Debug> {pointer: [...], vtable: [...]}
+// gdb-check:$3 = &unsized::Foo<dyn core::fmt::Debug> {pointer: [...], vtable: [...]}
 
 // gdb-command:print _box
-// gdbr-check:$4 = alloc::boxed::Box<unsized::Foo<dyn core::fmt::Debug>, alloc::alloc::Global> {pointer: [...], vtable: [...]}
+// gdb-check:$4 = alloc::boxed::Box<unsized::Foo<dyn core::fmt::Debug>, alloc::alloc::Global> {pointer: [...], vtable: [...]}
 
 // gdb-command:print tuple_slice
-// gdbr-check:$5 = &(i32, i32, [i32]) {data_ptr: [...], length: 2}
+// gdb-check:$5 = &(i32, i32, [i32]) {data_ptr: [...], length: 2}
 
 // gdb-command:print tuple_dyn
-// gdbr-check:$6 = &(i32, i32, dyn core::fmt::Debug) {pointer: [...], vtable: [...]}
+// gdb-check:$6 = &(i32, i32, dyn core::fmt::Debug) {pointer: [...], vtable: [...]}
 
 // === CDB TESTS ===================================================================================
 

tests/debuginfo/var-captured-in-nested-closure.rs

@@ -11,9 +11,9 @@
 // gdb-command:print constant
 // gdb-check:$2 = 2
 // gdb-command:print a_struct
-// gdbr-check:$3 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$3 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *struct_ref
-// gdbr-check:$4 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$4 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *owned
 // gdb-check:$5 = 6
 // gdb-command:print closure_local
@@ -25,9 +25,9 @@
 // gdb-command:print constant
 // gdb-check:$8 = 2
 // gdb-command:print a_struct
-// gdbr-check:$9 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$9 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *struct_ref
-// gdbr-check:$10 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$10 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *owned
 // gdb-check:$11 = 6
 // gdb-command:print closure_local

tests/debuginfo/var-captured-in-sendable-closure.rs

@@ -9,7 +9,7 @@
 // gdb-command:print constant
 // gdb-check:$1 = 1
 // gdb-command:print a_struct
-// gdbr-check:$2 = var_captured_in_sendable_closure::Struct {a: -2, b: 3.5, c: 4}
+// gdb-check:$2 = var_captured_in_sendable_closure::Struct {a: -2, b: 3.5, c: 4}
 // gdb-command:print *owned
 // gdb-check:$3 = 5
 // gdb-command:continue

tests/debuginfo/var-captured-in-stack-closure.rs

@@ -11,9 +11,9 @@
 // gdb-command:print constant
 // gdb-check:$2 = 2
 // gdb-command:print a_struct
-// gdbr-check:$3 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$3 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *struct_ref
-// gdbr-check:$4 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$4 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *owned
 // gdb-check:$5 = 6
 
@@ -24,9 +24,9 @@
 // gdb-command:print constant
 // gdb-check:$7 = 2
 // gdb-command:print a_struct
-// gdbr-check:$8 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$8 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *struct_ref
-// gdbr-check:$9 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdb-check:$9 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
 // gdb-command:print *owned
 // gdb-check:$10 = 6
 

tests/debuginfo/vec-slices.rs

@@ -12,49 +12,49 @@
 
 // gdb-command:print singleton.length
 // gdb-check:$2 = 1
-// gdbr-command:print *(singleton.data_ptr as *const [i64; 1])
+// gdb-command:print *(singleton.data_ptr as *const [i64; 1])
-// gdbr-check:$3 = [1]
+// gdb-check:$3 = [1]
 
 // gdb-command:print multiple.length
 // gdb-check:$4 = 4
-// gdbr-command:print *(multiple.data_ptr as *const [i64; 4])
+// gdb-command:print *(multiple.data_ptr as *const [i64; 4])
-// gdbr-check:$5 = [2, 3, 4, 5]
+// gdb-check:$5 = [2, 3, 4, 5]
 
 // gdb-command:print slice_of_slice.length
 // gdb-check:$6 = 2
-// gdbr-command:print *(slice_of_slice.data_ptr as *const [i64; 2])
+// gdb-command:print *(slice_of_slice.data_ptr as *const [i64; 2])
-// gdbr-check:$7 = [3, 4]
+// gdb-check:$7 = [3, 4]
 
 // gdb-command:print padded_tuple.length
 // gdb-check:$8 = 2
 // gdb-command:print padded_tuple.data_ptr[0]
-// gdbr-check:$9 = (6, 7)
+// gdb-check:$9 = (6, 7)
 // gdb-command:print padded_tuple.data_ptr[1]
-// gdbr-check:$10 = (8, 9)
+// gdb-check:$10 = (8, 9)
 
 // gdb-command:print padded_struct.length
 // gdb-check:$11 = 2
 // gdb-command:print padded_struct.data_ptr[0]
-// gdbr-check:$12 = vec_slices::AStruct {x: 10, y: 11, z: 12}
+// gdb-check:$12 = vec_slices::AStruct {x: 10, y: 11, z: 12}
 // gdb-command:print padded_struct.data_ptr[1]
-// gdbr-check:$13 = vec_slices::AStruct {x: 13, y: 14, z: 15}
+// gdb-check:$13 = vec_slices::AStruct {x: 13, y: 14, z: 15}
 
 // gdb-command:print mut_slice.length
 // gdb-check:$14 = 5
-// gdbr-command:print *(mut_slice.data_ptr as *const [i64; 5])
+// gdb-command:print *(mut_slice.data_ptr as *const [i64; 5])
-// gdbr-check:$15 = [1, 2, 3, 4, 5]
+// gdb-check:$15 = [1, 2, 3, 4, 5]
 
 // Some lines below are marked with [ignored] because old GDB versions seem to have trouble
 // accessing globals.
 
 // [ignored] gdbg-command:print 'vec_slices::MUT_VECT_SLICE'.length
-// gdbr-command:print MUT_VECT_SLICE.length
+// gdb-command:print MUT_VECT_SLICE.length
 // [ignored] gdbg-check:$16 = 2
-// gdbr-check:$16 = 2
+// gdb-check:$16 = 2
 // [ignored] gdbg-command:print *((i64[2]*)('vec_slices::MUT_VECT_SLICE'.data_ptr))
-// gdbr-command:print *(MUT_VECT_SLICE.data_ptr as *const [i64; 2])
+// gdb-command:print *(MUT_VECT_SLICE.data_ptr as *const [i64; 2])
 // [ignored] gdbg-check:$17 = {64, 65}
-// gdbr-check:$17 = [64, 65]
+// gdb-check:$17 = [64, 65]
 
 // === LLDB TESTS ==================================================================================
 

tests/debuginfo/vec.rs

@@ -6,9 +6,9 @@
 
 // gdb-command:run
 // gdb-command:print a
-// gdbr-check:$1 = [1, 2, 3]
+// gdb-check:$1 = [1, 2, 3]
 // gdb-command:print vec::VECT
-// gdbr-check:$2 = [4, 5, 6]
+// gdb-check:$2 = [4, 5, 6]
 
 
 // === LLDB TESTS ==================================================================================