Skip to content

Commit 5b1bfae

Browse files
[debuginfo] Adapt CDB tests after changes to whitespace usage in debuginfo type names.
1 parent 8fa22dd commit 5b1bfae

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Diff for: src/test/debuginfo/generic-struct.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@
4444
// cdb-command:g
4545

4646
// cdb-command:dx int_int
47-
// cdb-check:int_int [Type: generic_struct::AGenericStruct<i32, i32>]
47+
// cdb-check:int_int [Type: generic_struct::AGenericStruct<i32,i32>]
4848
// cdb-check:[...]key : 0 [Type: int]
4949
// cdb-check:[...]value : 1 [Type: int]
5050
// cdb-command:dx int_float
51-
// cdb-check:int_float [Type: generic_struct::AGenericStruct<i32, f64>]
51+
// cdb-check:int_float [Type: generic_struct::AGenericStruct<i32,f64>]
5252
// cdb-check:[...]key : 2 [Type: int]
5353
// cdb-check:[...]value : 3.500000 [Type: double]
5454
// cdb-command:dx float_int
55-
// cdb-check:float_int [Type: generic_struct::AGenericStruct<f64, i32>]
55+
// cdb-check:float_int [Type: generic_struct::AGenericStruct<f64,i32>]
5656
// cdb-check:[...]key : 4.500000 [Type: double]
5757
// cdb-check:[...]value : 5 [Type: int]
5858
// cdb-command:dx float_int_float
59-
// cdb-check:float_int_float [Type: generic_struct::AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64> >]
59+
// cdb-check:float_int_float [Type: generic_struct::AGenericStruct<f64,generic_struct::AGenericStruct<i32,f64> >]
6060
// cdb-check:[...]key : 6.500000 [Type: double]
61-
// cdb-check:[...]value [Type: generic_struct::AGenericStruct<i32, f64>]
61+
// cdb-check:[...]value [Type: generic_struct::AGenericStruct<i32,f64>]
6262

6363

6464
#![feature(omit_gdb_pretty_printer_section)]

Diff for: src/test/debuginfo/msvc-pretty-enums.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
// cdb-check: [+0x000] discriminant : 0x[...] [Type: enum$<core::option::Option<alloc::string::String>, 1, [...], Some>::Discriminant$]
8888

8989
// cdb-command: dx -r2 l,!
90-
// cdb-check:l,! : $T2 [Type: enum$<core::result::Result<u32, enum$<msvc_pretty_enums::Empty> >, Ok>]
91-
// cdb-check: [+0x000] Ok [Type: enum$<core::result::Result<u32, enum$<msvc_pretty_enums::Empty> >, Ok>::Ok]
90+
// cdb-check:l,! : $T2 [Type: enum$<core::result::Result<u32,enum$<msvc_pretty_enums::Empty> >, Ok>]
91+
// cdb-check: [+0x000] Ok [Type: enum$<core::result::Result<u32,enum$<msvc_pretty_enums::Empty> >, Ok>::Ok]
9292
// cdb-check: [+0x000] __0 : 0x2a [Type: unsigned int]
9393

9494
pub enum CStyleEnum {

Diff for: src/test/debuginfo/pretty-std-collections-hash.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// cdb-command: g
1111

1212
// cdb-command: dx hash_set,d
13-
// cdb-check:hash_set,d [...] : { len=15 } [Type: [...]::HashSet<u64, [...]>]
13+
// cdb-check:hash_set,d [...] : { len=15 } [Type: [...]::HashSet<u64,[...]>]
1414
// cdb-check: [len] : 15 [Type: [...]]
1515
// cdb-check: [capacity] : [...]
1616
// cdb-check: [[...]] [...] : 0 [Type: u64]
@@ -44,7 +44,7 @@
4444
// cdb-check: [[...]] [...] : 14 [Type: u64]
4545

4646
// cdb-command: dx hash_map,d
47-
// cdb-check:hash_map,d [...] : { len=15 } [Type: [...]::HashMap<u64, u64, [...]>]
47+
// cdb-check:hash_map,d [...] : { len=15 } [Type: [...]::HashMap<u64,u64,[...]>]
4848
// cdb-check: [len] : 15 [Type: [...]]
4949
// cdb-check: [capacity] : [...]
5050
// cdb-check: ["0x0"] : 0 [Type: unsigned __int64]

Diff for: src/test/debuginfo/pretty-std.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
// cdb-check: [3] : 3 [Type: int]
8080

8181
// cdb-command: dx vec,d
82-
// cdb-check:vec,d [...] : { len=4 } [Type: [...]::Vec<u64, alloc::alloc::Global>]
82+
// cdb-check:vec,d [...] : { len=4 } [Type: [...]::Vec<u64,alloc::alloc::Global>]
8383
// cdb-check: [len] : 4 [Type: [...]]
8484
// cdb-check: [capacity] : [...] [Type: [...]]
8585
// cdb-check: [0] : 4 [Type: unsigned __int64]

Diff for: src/test/debuginfo/result-types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
// cdb-command: g
88

99
// cdb-command: dx x,d
10-
// cdb-check:x,d : Ok [Type: enum$<core::result::Result<i32, str> >]
10+
// cdb-check:x,d : Ok [Type: enum$<core::result::Result<i32,str> >]
1111
// cdb-check: [...] __0 : -3 [Type: int]
1212

1313
// cdb-command: dx y
14-
// cdb-check:y : Err [Type: enum$<core::result::Result<i32, str> >]
14+
// cdb-check:y : Err [Type: enum$<core::result::Result<i32,str> >]
1515
// cdb-check: [...] __0 : "Some error message" [Type: str]
1616

1717
fn main()

0 commit comments

Comments
 (0)