Delete lldbr annotations

tests/debuginfo/associated-types.rs

@@ -38,41 +38,32 @@
 
 // lldb-command:v arg
 // lldbg-check:[...] { b = -1, b1 = 0 }
-// lldbr-check:(associated_types::Struct<i32>) arg = { b = -1, b1 = 0 }
 // lldb-command:continue
 
 // lldb-command:v inferred
 // lldbg-check:[...] 1
-// lldbr-check:(i64) inferred = 1
 // lldb-command:v explicitly
 // lldbg-check:[...] 1
-// lldbr-check:(i64) explicitly = 1
 // lldb-command:continue
 
 // lldb-command:v arg
 // lldbg-check:[...] 2
-// lldbr-check:(i64) arg = 2
 // lldb-command:continue
 
 // lldb-command:v arg
 // lldbg-check:[...] (4, 5)
-// lldbr-check:((i32, i64)) arg = { = 4 = 5 }
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 6
-// lldbr-check:(i32) a = 6
 // lldb-command:v b
 // lldbg-check:[...] 7
-// lldbr-check:(i64) b = 7
 // lldb-command:continue
 
 // lldb-command:v a
 // lldbg-check:[...] 8
-// lldbr-check:(i64) a = 8
 // lldb-command:v b
 // lldbg-check:[...] 9
-// lldbr-check:(i32) b = 9
 // lldb-command:continue
 
 #![allow(unused_variables)]

tests/debuginfo/basic-types.rs

@@ -47,48 +47,31 @@
 // lldb-command:run
 // lldb-command:v b
 // lldbg-check:[...] false
-// lldbr-check:(bool) b = false
 // lldb-command:v i
 // lldbg-check:[...] -1
-// lldbr-check:(isize) i = -1
-
-// NOTE: only rust-enabled lldb supports 32bit chars
-// lldbr-command:print c
-// lldbr-check:(char) c = 'a'
 
 // lldb-command:v i8
 // lldbg-check:[...] 'D'
-// lldbr-check:(i8) i8 = 68
 // lldb-command:v i16
 // lldbg-check:[...] -16
-// lldbr-check:(i16) i16 = -16
 // lldb-command:v i32
 // lldbg-check:[...] -32
-// lldbr-check:(i32) i32 = -32
 // lldb-command:v i64
 // lldbg-check:[...] -64
-// lldbr-check:(i64) i64 = -64
 // lldb-command:v u
 // lldbg-check:[...] 1
-// lldbr-check:(usize) u = 1
 // lldb-command:v u8
 // lldbg-check:[...] 'd'
-// lldbr-check:(u8) u8 = 100
 // lldb-command:v u16
 // lldbg-check:[...] 16
-// lldbr-check:(u16) u16 = 16
 // lldb-command:v u32
 // lldbg-check:[...] 32
-// lldbr-check:(u32) u32 = 32
 // lldb-command:v u64
 // lldbg-check:[...] 64
-// lldbr-check:(u64) u64 = 64
 // lldb-command:v f32
 // lldbg-check:[...] 2.5
-// lldbr-check:(f32) f32 = 2.5
 // lldb-command:v f64
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) f64 = 3.5
 
 // === CDB TESTS ===================================================================================
 

tests/debuginfo/borrowed-basic.rs

@@ -54,62 +54,46 @@
 // lldb-command:run
 // lldb-command:v *bool_ref
 // lldbg-check:[...] true
-// lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:v *int_ref
 // lldbg-check:[...] -1
-// lldbr-check:(isize) *int_ref = -1
 
-// lldbr-command:print *char_ref
-// lldbr-check:(char) *char_ref = 'a'
 
 // lldb-command:v *i8_ref
 // lldbg-check:[...] 'D'
-// lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:v *i16_ref
 // lldbg-check:[...] -16
-// lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:v *i32_ref
 // lldbg-check:[...] -32
-// lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:v *i64_ref
 // lldbg-check:[...] -64
-// lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:v *uint_ref
 // lldbg-check:[...] 1
-// lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:v *u8_ref
 // lldbg-check:[...] 'd'
-// lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:v *u16_ref
 // lldbg-check:[...] 16
-// lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:v *u32_ref
 // lldbg-check:[...] 32
-// lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:v *u64_ref
 // lldbg-check:[...] 64
-// lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:v *f16_ref
 // lldbg-check:[...] 1.5
-// lldbr-check:(f16) *f16_ref = 1.5
 
 // lldb-command:v *f32_ref
 // lldbg-check:[...] 2.5
-// lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:v *f64_ref
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) *f64_ref = 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

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

@@ -20,15 +20,12 @@
 
 // lldb-command:v *the_a_ref
 // lldbg-check:[...] TheA
-// lldbr-check:(borrowed_c_style_enum::ABC) *the_a_ref = borrowed_c_style_enum::ABC::TheA
 
 // lldb-command:v *the_b_ref
 // lldbg-check:[...] TheB
-// lldbr-check:(borrowed_c_style_enum::ABC) *the_b_ref = borrowed_c_style_enum::ABC::TheB
 
 // lldb-command:v *the_c_ref
 // lldbg-check:[...] TheC
-// lldbr-check:(borrowed_c_style_enum::ABC) *the_c_ref = borrowed_c_style_enum::ABC::TheC
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/borrowed-enum.rs

@@ -22,13 +22,10 @@
 
 // lldb-command:v *the_a_ref
 // lldbg-check:(borrowed_enum::ABC) *the_a_ref = { value = { x = 0 y = 8970181431921507452 } $discr$ = 0 }
-// lldbr-check:(borrowed_enum::ABC::TheA) *the_a_ref = TheA { TheA: 0, TheB: 8970181431921507452 }
 // lldb-command:v *the_b_ref
 // lldbg-check:(borrowed_enum::ABC) *the_b_ref = { value = { 0 = 0 1 = 286331153 2 = 286331153 } $discr$ = 1 }
-// lldbr-check:(borrowed_enum::ABC::TheB) *the_b_ref = { = 0 = 286331153 = 286331153 }
 // lldb-command:v *univariant_ref
 // lldbg-check:(borrowed_enum::Univariant) *univariant_ref = { value = { 0 = 4820353753753434 } }
-// lldbr-check:(borrowed_enum::Univariant) *univariant_ref = { TheOnlyCase = { = 4820353753753434 } }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/borrowed-struct.rs

@@ -32,31 +32,24 @@
 
 // lldb-command:v *stack_val_ref
 // lldbg-check:[...] { x = 10 y = 23.5 }
-// lldbr-check:(borrowed_struct::SomeStruct) *stack_val_ref = (x = 10, y = 23.5)
 
 // lldb-command:v *stack_val_interior_ref_1
 // lldbg-check:[...] 10
-// lldbr-check:(isize) *stack_val_interior_ref_1 = 10
 
 // lldb-command:v *stack_val_interior_ref_2
 // lldbg-check:[...] 23.5
-// lldbr-check:(f64) *stack_val_interior_ref_2 = 23.5
 
 // lldb-command:v *ref_to_unnamed
 // lldbg-check:[...] { x = 11 y = 24.5 }
-// lldbr-check:(borrowed_struct::SomeStruct) *ref_to_unnamed = (x = 11, y = 24.5)
 
 // lldb-command:v *unique_val_ref
 // lldbg-check:[...] { x = 13 y = 26.5 }
-// lldbr-check:(borrowed_struct::SomeStruct) *unique_val_ref = (x = 13, y = 26.5)
 
 // lldb-command:v *unique_val_interior_ref_1
 // lldbg-check:[...] 13
-// lldbr-check:(isize) *unique_val_interior_ref_1 = 13
 
 // lldb-command:v *unique_val_interior_ref_2
 // lldbg-check:[...] 26.5
-// lldbr-check:(f64) *unique_val_interior_ref_2 = 26.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/borrowed-tuple.rs

@@ -20,15 +20,12 @@
 
 // lldb-command:v *stack_val_ref
 // lldbg-check:[...] { 0 = -14 1 = -19 }
-// lldbr-check:((i16, f32)) *stack_val_ref = { 0 = -14 1 = -19 }
 
 // lldb-command:v *ref_to_unnamed
 // lldbg-check:[...] { 0 = -15 1 = -20 }
-// lldbr-check:((i16, f32)) *ref_to_unnamed = { 0 = -15 1 = -20 }
 
 // lldb-command:v *unique_val_ref
 // lldbg-check:[...] { 0 = -17 1 = -22 }
-// lldbr-check:((i16, f32)) *unique_val_ref = { 0 = -17 1 = -22 }
 
 
 #![allow(unused_variables)]

tests/debuginfo/borrowed-unique-basic.rs

@@ -58,62 +58,46 @@
 
 // lldb-command:v *bool_ref
 // lldbg-check:[...] true
-// lldbr-check:(bool) *bool_ref = true
 
 // lldb-command:v *int_ref
 // lldbg-check:[...] -1
-// lldbr-check:(isize) *int_ref = -1
 
-// lldbr-command:print *char_ref
-// lldbr-check:(char) *char_ref = 97
 
 // lldb-command:v *i8_ref
 // lldbg-check:[...] 68
-// lldbr-check:(i8) *i8_ref = 68
 
 // lldb-command:v *i16_ref
 // lldbg-check:[...] -16
-// lldbr-check:(i16) *i16_ref = -16
 
 // lldb-command:v *i32_ref
 // lldbg-check:[...] -32
-// lldbr-check:(i32) *i32_ref = -32
 
 // lldb-command:v *i64_ref
 // lldbg-check:[...] -64
-// lldbr-check:(i64) *i64_ref = -64
 
 // lldb-command:v *uint_ref
 // lldbg-check:[...] 1
-// lldbr-check:(usize) *uint_ref = 1
 
 // lldb-command:v *u8_ref
 // lldbg-check:[...] 100
-// lldbr-check:(u8) *u8_ref = 100
 
 // lldb-command:v *u16_ref
 // lldbg-check:[...] 16
-// lldbr-check:(u16) *u16_ref = 16
 
 // lldb-command:v *u32_ref
 // lldbg-check:[...] 32
-// lldbr-check:(u32) *u32_ref = 32
 
 // lldb-command:v *u64_ref
 // lldbg-check:[...] 64
-// lldbr-check:(u64) *u64_ref = 64
 
 // lldb-command:v *f16_ref
 // lldbg-check:[...] 1.5
-// lldbr-check:(f16) *f16_ref = 1.5
 
 // lldb-command:v *f32_ref
 // lldbg-check:[...] 2.5
-// lldbr-check:(f32) *f32_ref = 2.5
 
 // lldb-command:v *f64_ref
 // lldbg-check:[...] 3.5
-// lldbr-check:(f64) *f64_ref = 3.5
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/box.rs

@@ -15,10 +15,8 @@
 // lldb-command:run
 // lldb-command:v *a
 // lldbg-check:[...] 1
-// lldbr-check:(i32) *a = 1
 // lldb-command:v *b
 // lldbg-check:[...] { 0 = 2 1 = 3.5 }
-// lldbr-check:((i32, f64)) *b = { 0 = 2 1 = 3.5 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/boxed-struct.rs

@@ -17,11 +17,9 @@
 
 // lldb-command:v *boxed_with_padding
 // lldbg-check:[...] { x = 99 y = 999 z = 9999 w = 99999 }
-// lldbr-check:(boxed_struct::StructWithSomePadding) *boxed_with_padding = { x = 99 y = 999 z = 9999 w = 99999 }
 
 // lldb-command:v *boxed_with_dtor
 // lldbg-check:[...] { x = 77 y = 777 z = 7777 w = 77777 }
-// lldbr-check:(boxed_struct::StructWithDestructor) *boxed_with_dtor = { x = 77 y = 777 z = 7777 w = 77777 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

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

@@ -23,17 +23,14 @@
 
 // lldb-command:v self
 // lldbg-check:[...] 1111
-// lldbr-check:(isize) self = 1111
 // lldb-command:continue
 
 // lldb-command:v self
 // lldbg-check:[...] { x = 2222 y = 3333 }
-// lldbr-check:(by_value_self_argument_in_trait_impl::Struct) self = { x = 2222 y = 3333 }
 // lldb-command:continue
 
 // lldb-command:v self
 // lldbg-check:[...] { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
-// lldbr-check:((f64, isize, isize, f64)) self = { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
 // lldb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]

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

@@ -31,31 +31,24 @@
 
 // lldb-command:v tuple_interior_padding
 // lldbg-check:[...] { 0 = 0 1 = OneHundred }
-// lldbr-check:((i16, c_style_enum_in_composite::AnEnum)) tuple_interior_padding = { 0 = 0 1 = OneHundred }
 
 // lldb-command:v tuple_padding_at_end
 // lldbg-check:[...] { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
-// lldbr-check:(((u64, c_style_enum_in_composite::AnEnum), u64)) tuple_padding_at_end = { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
 
 // lldb-command:v tuple_different_enums
 // lldbg-check:[...] { 0 = OneThousand 1 = MountainView 2 = OneMillion 3 = Vienna }
-// lldbr-check:((c_style_enum_in_composite::AnEnum, c_style_enum_in_composite::AnotherEnum, c_style_enum_in_composite::AnEnum, c_style_enum_in_composite::AnotherEnum)) tuple_different_enums = { 0 = c_style_enum_in_composite::AnEnum::OneThousand 1 = c_style_enum_in_composite::AnotherEnum::MountainView 2 = c_style_enum_in_composite::AnEnum::OneMillion 3 = c_style_enum_in_composite::AnotherEnum::Vienna }
 
 // lldb-command:v padded_struct
 // lldbg-check:[...] { a = 3 b = OneMillion c = 4 d = Toronto e = 5 }
-// lldbr-check:(c_style_enum_in_composite::PaddedStruct) padded_struct = { a = 3 b = c_style_enum_in_composite::AnEnum::OneMillion c = 4 d = Toronto e = 5 }
 
 // lldb-command:v packed_struct
 // lldbg-check:[...] { a = 6 b = OneHundred c = 7 d = Vienna e = 8 }
-// lldbr-check:(c_style_enum_in_composite::PackedStruct) packed_struct = { a = 6 b = c_style_enum_in_composite::AnEnum::OneHundred c = 7 d = Vienna e = 8 }
 
 // lldb-command:v non_padded_struct
 // lldbg-check:[...] { a = OneMillion b = MountainView c = OneThousand d = Toronto }
-// lldbr-check:(c_style_enum_in_composite::NonPaddedStruct) non_padded_struct = { 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 }
 
 // lldb-command:v struct_with_drop
 // lldbg-check:[...] { 0 = { a = OneHundred b = Vienna } 1 = 9 }
-// lldbr-check:((c_style_enum_in_composite::StructWithDrop, i64)) struct_with_drop = { 0 = { a = c_style_enum_in_composite::AnEnum::OneHundred b = c_style_enum_in_composite::AnotherEnum::Vienna } 1 = 9 }
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]

tests/debuginfo/c-style-enum.rs

@@ -67,31 +67,24 @@
 
 // lldb-command:v auto_one
 // lldbg-check:[...] One
-// lldbr-check:(c_style_enum::AutoDiscriminant) auto_one = c_style_enum::AutoDiscriminant::One
 
 // lldb-command:v auto_two
 // lldbg-check:[...] Two
-// lldbr-check:(c_style_enum::AutoDiscriminant) auto_two = c_style_enum::AutoDiscriminant::Two
 
 // lldb-command:v auto_three
 // lldbg-check:[...] Three
-// lldbr-check:(c_style_enum::AutoDiscriminant) auto_three = c_style_enum::AutoDiscriminant::Three
 
 // lldb-command:v manual_one_hundred
 // lldbg-check:[...] OneHundred
-// lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_hundred = c_style_enum::ManualDiscriminant::OneHundred
 
 // lldb-command:v manual_one_thousand
 // lldbg-check:[...] OneThousand
-// lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_thousand = c_style_enum::ManualDiscriminant::OneThousand
 
 // lldb-command:v manual_one_million
 // lldbg-check:[...] OneMillion
-// lldbr-check:(c_style_enum::ManualDiscriminant) manual_one_million = c_style_enum::ManualDiscriminant::OneMillion
 
 // lldb-command:v single_variant
 // lldbg-check:[...] TheOnlyVariant
-// lldbr-check:(c_style_enum::SingleVariant) single_variant = c_style_enum::SingleVariant::TheOnlyVariant
 
 #![allow(unused_variables)]
 #![allow(dead_code)]