Skip to content

Commit ba4773d

Browse files
saethlinsaethlin
committed
Replace lldbr with lldb
1 parent 3270bb9 commit ba4773d

File tree

73 files changed

+671
-680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+671
-680
lines changed

‎tests/debuginfo/associated-types.rs

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Some versions of the non-rust-enabled LLDB print the wrong generic
22
// parameter type names in this test.
3-
//@ needs-rust-lldb
43

54
//@ compile-flags:-g
65

@@ -41,33 +40,33 @@
4140
// lldb-command:run
4241

4342
// lldb-command:v arg
44-
// lldbr-check:(associated_types::Struct<i32>) arg = { b = -1, b1 = 0 }
43+
// lldb-check:(associated_types::Struct<i32>) arg = { b = -1, b1 = 0 }
4544
// lldb-command:continue
4645

4746
// lldb-command:v inferred
48-
// lldbr-check:(i64) inferred = 1
47+
// lldb-check:(i64) inferred = 1
4948
// lldb-command:v explicitly
50-
// lldbr-check:(i64) explicitly = 1
49+
// lldb-check:(i64) explicitly = 1
5150
// lldb-command:continue
5251

5352
// lldb-command:v arg
54-
// lldbr-check:(i64) arg = 2
53+
// lldb-check:(i64) arg = 2
5554
// lldb-command:continue
5655

5756
// lldb-command:v arg
58-
// lldbr-check:((i32, i64)) arg = { = 4 = 5 }
57+
// lldb-check:((i32, i64)) arg = { = 4 = 5 }
5958
// lldb-command:continue
6059

6160
// lldb-command:v a
62-
// lldbr-check:(i32) a = 6
61+
// lldb-check:(i32) a = 6
6362
// lldb-command:v b
64-
// lldbr-check:(i64) b = 7
63+
// lldb-check:(i64) b = 7
6564
// lldb-command:continue
6665

6766
// lldb-command:v a
68-
// lldbr-check:(i64) a = 8
67+
// lldb-check:(i64) a = 8
6968
// lldb-command:v b
70-
// lldbr-check:(i32) b = 9
69+
// lldb-check:(i32) b = 9
7170
// lldb-command:continue
7271

7372
#![allow(unused_variables)]

‎tests/debuginfo/basic-types.rs

+15-16
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,35 @@
4848

4949
// lldb-command:run
5050
// lldb-command:v b
51-
// lldbr-check:(bool) b = false
51+
// lldb-check:(bool) b = false
5252
// lldb-command:v i
53-
// lldbr-check:(isize) i = -1
53+
// lldb-check:(isize) i = -1
5454

55-
// NOTE: only rust-enabled lldb supports 32bit chars
56-
// lldbr-command:print c
57-
// lldbr-check:(char) c = 'a'
55+
// lldb-command:print c
56+
// lldb-check:(char) c = 'a'
5857

5958
// lldb-command:v i8
60-
// lldbr-check:(i8) i8 = 68
59+
// lldb-check:(i8) i8 = 68
6160
// lldb-command:v i16
62-
// lldbr-check:(i16) i16 = -16
61+
// lldb-check:(i16) i16 = -16
6362
// lldb-command:v i32
64-
// lldbr-check:(i32) i32 = -32
63+
// lldb-check:(i32) i32 = -32
6564
// lldb-command:v i64
66-
// lldbr-check:(i64) i64 = -64
65+
// lldb-check:(i64) i64 = -64
6766
// lldb-command:v u
68-
// lldbr-check:(usize) u = 1
67+
// lldb-check:(usize) u = 1
6968
// lldb-command:v u8
70-
// lldbr-check:(u8) u8 = 100
69+
// lldb-check:(u8) u8 = 100
7170
// lldb-command:v u16
72-
// lldbr-check:(u16) u16 = 16
71+
// lldb-check:(u16) u16 = 16
7372
// lldb-command:v u32
74-
// lldbr-check:(u32) u32 = 32
73+
// lldb-check:(u32) u32 = 32
7574
// lldb-command:v u64
76-
// lldbr-check:(u64) u64 = 64
75+
// lldb-check:(u64) u64 = 64
7776
// lldb-command:v f32
78-
// lldbr-check:(f32) f32 = 2.5
77+
// lldb-check:(f32) f32 = 2.5
7978
// lldb-command:v f64
80-
// lldbr-check:(f64) f64 = 3.5
79+
// lldb-check:(f64) f64 = 3.5
8180

8281
// === CDB TESTS ===================================================================================
8382

‎tests/debuginfo/borrowed-basic.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -54,50 +54,50 @@
5454

5555
// lldb-command:run
5656
// lldb-command:v *bool_ref
57-
// lldbr-check:(bool) *bool_ref = true
57+
// lldb-check:(bool) *bool_ref = true
5858

5959
// lldb-command:v *int_ref
60-
// lldbr-check:(isize) *int_ref = -1
60+
// lldb-check:(isize) *int_ref = -1
6161

6262
// NOTE: only rust-enabled lldb supports 32bit chars
63-
// lldbr-command:print *char_ref
64-
// lldbr-check:(char) *char_ref = 'a'
63+
// lldb-command:print *char_ref
64+
// lldb-check:(char) *char_ref = 'a'
6565

6666
// lldb-command:v *i8_ref
67-
// lldbr-check:(i8) *i8_ref = 68
67+
// lldb-check:(i8) *i8_ref = 68
6868

6969
// lldb-command:v *i16_ref
70-
// lldbr-check:(i16) *i16_ref = -16
70+
// lldb-check:(i16) *i16_ref = -16
7171

7272
// lldb-command:v *i32_ref
73-
// lldbr-check:(i32) *i32_ref = -32
73+
// lldb-check:(i32) *i32_ref = -32
7474

7575
// lldb-command:v *i64_ref
76-
// lldbr-check:(i64) *i64_ref = -64
76+
// lldb-check:(i64) *i64_ref = -64
7777

7878
// lldb-command:v *uint_ref
79-
// lldbr-check:(usize) *uint_ref = 1
79+
// lldb-check:(usize) *uint_ref = 1
8080

8181
// lldb-command:v *u8_ref
82-
// lldbr-check:(u8) *u8_ref = 100
82+
// lldb-check:(u8) *u8_ref = 100
8383

8484
// lldb-command:v *u16_ref
85-
// lldbr-check:(u16) *u16_ref = 16
85+
// lldb-check:(u16) *u16_ref = 16
8686

8787
// lldb-command:v *u32_ref
88-
// lldbr-check:(u32) *u32_ref = 32
88+
// lldb-check:(u32) *u32_ref = 32
8989

9090
// lldb-command:v *u64_ref
91-
// lldbr-check:(u64) *u64_ref = 64
91+
// lldb-check:(u64) *u64_ref = 64
9292

9393
// lldb-command:v *f16_ref
94-
// lldbr-check:(f16) *f16_ref = 1.5
94+
// lldb-check:(f16) *f16_ref = 1.5
9595

9696
// lldb-command:v *f32_ref
97-
// lldbr-check:(f32) *f32_ref = 2.5
97+
// lldb-check:(f32) *f32_ref = 2.5
9898

9999
// lldb-command:v *f64_ref
100-
// lldbr-check:(f64) *f64_ref = 3.5
100+
// lldb-check:(f64) *f64_ref = 3.5
101101

102102
#![allow(unused_variables)]
103103
#![feature(omit_gdb_pretty_printer_section)]

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
// lldb-command:run
2121

2222
// lldb-command:v *the_a_ref
23-
// lldbr-check:(borrowed_c_style_enum::ABC) *the_a_ref = borrowed_c_style_enum::ABC::TheA
23+
// lldb-check:(borrowed_c_style_enum::ABC) *the_a_ref = borrowed_c_style_enum::ABC::TheA
2424

2525
// lldb-command:v *the_b_ref
26-
// lldbr-check:(borrowed_c_style_enum::ABC) *the_b_ref = borrowed_c_style_enum::ABC::TheB
26+
// lldb-check:(borrowed_c_style_enum::ABC) *the_b_ref = borrowed_c_style_enum::ABC::TheB
2727

2828
// lldb-command:v *the_c_ref
29-
// lldbr-check:(borrowed_c_style_enum::ABC) *the_c_ref = borrowed_c_style_enum::ABC::TheC
29+
// lldb-check:(borrowed_c_style_enum::ABC) *the_c_ref = borrowed_c_style_enum::ABC::TheC
3030

3131
#![allow(unused_variables)]
3232
#![feature(omit_gdb_pretty_printer_section)]

‎tests/debuginfo/borrowed-enum.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
// lldb-command:run
2424

2525
// lldb-command:v *the_a_ref
26-
// lldbr-check:(borrowed_enum::ABC::TheA) *the_a_ref = TheA { TheA: 0, TheB: 8970181431921507452 }
26+
// lldb-check:(borrowed_enum::ABC::TheA) *the_a_ref = TheA { TheA: 0, TheB: 8970181431921507452 }
2727
// lldb-command:v *the_b_ref
28-
// lldbr-check:(borrowed_enum::ABC::TheB) *the_b_ref = { = 0 = 286331153 = 286331153 }
28+
// lldb-check:(borrowed_enum::ABC::TheB) *the_b_ref = { = 0 = 286331153 = 286331153 }
2929
// lldb-command:v *univariant_ref
30-
// lldbr-check:(borrowed_enum::Univariant) *univariant_ref = { TheOnlyCase = { = 4820353753753434 } }
30+
// lldb-check:(borrowed_enum::Univariant) *univariant_ref = { TheOnlyCase = { = 4820353753753434 } }
3131

3232
#![allow(unused_variables)]
3333
#![feature(omit_gdb_pretty_printer_section)]

‎tests/debuginfo/borrowed-struct.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232
// lldb-command:run
3333

3434
// lldb-command:v *stack_val_ref
35-
// lldbr-check:(borrowed_struct::SomeStruct) *stack_val_ref = (x = 10, y = 23.5)
35+
// lldb-check:(borrowed_struct::SomeStruct) *stack_val_ref = (x = 10, y = 23.5)
3636

3737
// lldb-command:v *stack_val_interior_ref_1
38-
// lldbr-check:(isize) *stack_val_interior_ref_1 = 10
38+
// lldb-check:(isize) *stack_val_interior_ref_1 = 10
3939

4040
// lldb-command:v *stack_val_interior_ref_2
41-
// lldbr-check:(f64) *stack_val_interior_ref_2 = 23.5
41+
// lldb-check:(f64) *stack_val_interior_ref_2 = 23.5
4242

4343
// lldb-command:v *ref_to_unnamed
44-
// lldbr-check:(borrowed_struct::SomeStruct) *ref_to_unnamed = (x = 11, y = 24.5)
44+
// lldb-check:(borrowed_struct::SomeStruct) *ref_to_unnamed = (x = 11, y = 24.5)
4545

4646
// lldb-command:v *unique_val_ref
47-
// lldbr-check:(borrowed_struct::SomeStruct) *unique_val_ref = (x = 13, y = 26.5)
47+
// lldb-check:(borrowed_struct::SomeStruct) *unique_val_ref = (x = 13, y = 26.5)
4848

4949
// lldb-command:v *unique_val_interior_ref_1
50-
// lldbr-check:(isize) *unique_val_interior_ref_1 = 13
50+
// lldb-check:(isize) *unique_val_interior_ref_1 = 13
5151

5252
// lldb-command:v *unique_val_interior_ref_2
53-
// lldbr-check:(f64) *unique_val_interior_ref_2 = 26.5
53+
// lldb-check:(f64) *unique_val_interior_ref_2 = 26.5
5454

5555
#![allow(unused_variables)]
5656
#![feature(omit_gdb_pretty_printer_section)]

‎tests/debuginfo/borrowed-tuple.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
// lldb-command:run
2222

2323
// lldb-command:v *stack_val_ref
24-
// lldbr-check:((i16, f32)) *stack_val_ref = { 0 = -14 1 = -19 }
24+
// lldb-check:((i16, f32)) *stack_val_ref = { 0 = -14 1 = -19 }
2525

2626
// lldb-command:v *ref_to_unnamed
27-
// lldbr-check:((i16, f32)) *ref_to_unnamed = { 0 = -15 1 = -20 }
27+
// lldb-check:((i16, f32)) *ref_to_unnamed = { 0 = -15 1 = -20 }
2828

2929
// lldb-command:v *unique_val_ref
30-
// lldbr-check:((i16, f32)) *unique_val_ref = { 0 = -17 1 = -22 }
30+
// lldb-check:((i16, f32)) *unique_val_ref = { 0 = -17 1 = -22 }
3131

3232

3333
#![allow(unused_variables)]

‎tests/debuginfo/borrowed-unique-basic.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -59,50 +59,50 @@
5959
// lldb-command:run
6060

6161
// lldb-command:v *bool_ref
62-
// lldbr-check:(bool) *bool_ref = true
62+
// lldb-check:(bool) *bool_ref = true
6363

6464
// lldb-command:v *int_ref
65-
// lldbr-check:(isize) *int_ref = -1
65+
// lldb-check:(isize) *int_ref = -1
6666

6767
// NOTE: only rust-enabled lldb supports 32bit chars
68-
// lldbr-command:print *char_ref
69-
// lldbr-check:(char) *char_ref = 97
68+
// lldb-command:print *char_ref
69+
// lldb-check:(char) *char_ref = 97
7070

7171
// lldb-command:v *i8_ref
72-
// lldbr-check:(i8) *i8_ref = 68
72+
// lldb-check:(i8) *i8_ref = 68
7373

7474
// lldb-command:v *i16_ref
75-
// lldbr-check:(i16) *i16_ref = -16
75+
// lldb-check:(i16) *i16_ref = -16
7676

7777
// lldb-command:v *i32_ref
78-
// lldbr-check:(i32) *i32_ref = -32
78+
// lldb-check:(i32) *i32_ref = -32
7979

8080
// lldb-command:v *i64_ref
81-
// lldbr-check:(i64) *i64_ref = -64
81+
// lldb-check:(i64) *i64_ref = -64
8282

8383
// lldb-command:v *uint_ref
84-
// lldbr-check:(usize) *uint_ref = 1
84+
// lldb-check:(usize) *uint_ref = 1
8585

8686
// lldb-command:v *u8_ref
87-
// lldbr-check:(u8) *u8_ref = 100
87+
// lldb-check:(u8) *u8_ref = 100
8888

8989
// lldb-command:v *u16_ref
90-
// lldbr-check:(u16) *u16_ref = 16
90+
// lldb-check:(u16) *u16_ref = 16
9191

9292
// lldb-command:v *u32_ref
93-
// lldbr-check:(u32) *u32_ref = 32
93+
// lldb-check:(u32) *u32_ref = 32
9494

9595
// lldb-command:v *u64_ref
96-
// lldbr-check:(u64) *u64_ref = 64
96+
// lldb-check:(u64) *u64_ref = 64
9797

9898
// lldb-command:v *f16_ref
99-
// lldbr-check:(f16) *f16_ref = 1.5
99+
// lldb-check:(f16) *f16_ref = 1.5
100100

101101
// lldb-command:v *f32_ref
102-
// lldbr-check:(f32) *f32_ref = 2.5
102+
// lldb-check:(f32) *f32_ref = 2.5
103103

104104
// lldb-command:v *f64_ref
105-
// lldbr-check:(f64) *f64_ref = 3.5
105+
// lldb-check:(f64) *f64_ref = 3.5
106106

107107
#![allow(unused_variables)]
108108
#![feature(omit_gdb_pretty_printer_section)]

‎tests/debuginfo/box.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
// lldb-command:run
1818
// lldb-command:v *a
19-
// lldbr-check:(i32) *a = 1
19+
// lldb-check:(i32) *a = 1
2020
// lldb-command:v *b
21-
// lldbr-check:((i32, f64)) *b = { 0 = 2 1 = 3.5 }
21+
// lldb-check:((i32, f64)) *b = { 0 = 2 1 = 3.5 }
2222

2323
#![allow(unused_variables)]
2424
#![feature(omit_gdb_pretty_printer_section)]

‎tests/debuginfo/boxed-struct.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
// lldb-command:run
1919

2020
// lldb-command:v *boxed_with_padding
21-
// lldbr-check:(boxed_struct::StructWithSomePadding) *boxed_with_padding = { x = 99 y = 999 z = 9999 w = 99999 }
21+
// lldb-check:(boxed_struct::StructWithSomePadding) *boxed_with_padding = { x = 99 y = 999 z = 9999 w = 99999 }
2222

2323
// lldb-command:v *boxed_with_dtor
24-
// lldbr-check:(boxed_struct::StructWithDestructor) *boxed_with_dtor = { x = 77 y = 777 z = 7777 w = 77777 }
24+
// lldb-check:(boxed_struct::StructWithDestructor) *boxed_with_dtor = { x = 77 y = 777 z = 7777 w = 77777 }
2525

2626
#![allow(unused_variables)]
2727
#![feature(omit_gdb_pretty_printer_section)]

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
// lldb-command:run
2525

2626
// lldb-command:v self
27-
// lldbr-check:(isize) self = 1111
27+
// lldb-check:(isize) self = 1111
2828
// lldb-command:continue
2929

3030
// lldb-command:v self
31-
// lldbr-check:(by_value_self_argument_in_trait_impl::Struct) self = { x = 2222 y = 3333 }
31+
// lldb-check:(by_value_self_argument_in_trait_impl::Struct) self = { x = 2222 y = 3333 }
3232
// lldb-command:continue
3333

3434
// lldb-command:v self
35-
// lldbr-check:((f64, isize, isize, f64)) self = { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
35+
// lldb-check:((f64, isize, isize, f64)) self = { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
3636
// lldb-command:continue
3737

3838
#![feature(omit_gdb_pretty_printer_section)]

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@
3232
// lldb-command:run
3333

3434
// lldb-command:v tuple_interior_padding
35-
// lldbr-check:((i16, c_style_enum_in_composite::AnEnum)) tuple_interior_padding = { 0 = 0 1 = OneHundred }
35+
// lldb-check:((i16, c_style_enum_in_composite::AnEnum)) tuple_interior_padding = { 0 = 0 1 = OneHundred }
3636

3737
// lldb-command:v tuple_padding_at_end
38-
// lldbr-check:(((u64, c_style_enum_in_composite::AnEnum), u64)) tuple_padding_at_end = { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
38+
// lldb-check:(((u64, c_style_enum_in_composite::AnEnum), u64)) tuple_padding_at_end = { 0 = { 0 = 1 1 = OneThousand } 1 = 2 }
3939

4040
// lldb-command:v tuple_different_enums
41-
// 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 }
41+
// lldb-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 }
4242

4343
// lldb-command:v padded_struct
44-
// 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 }
44+
// lldb-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 }
4545

4646
// lldb-command:v packed_struct
47-
// 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 }
47+
// lldb-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 }
4848

4949
// lldb-command:v non_padded_struct
50-
// 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 }
50+
// lldb-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 }
5151

5252
// lldb-command:v struct_with_drop
53-
// 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 }
53+
// lldb-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 }
5454

5555
#![allow(unused_variables)]
5656
#![feature(omit_gdb_pretty_printer_section)]

0 commit comments

Comments
 (0)