diff options
| author | Michael Woerister <michaelwoerister@posteo> | 2021-07-19 11:00:21 +0200 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@posteo> | 2021-07-19 16:00:04 +0200 |
| commit | 5b1bfaed8c387ff36200ad789a4a215680fbff79 (patch) | |
| tree | b4656968354370c65ecd1f4508624208b6650cb9 | |
| parent | 8fa22dd9b73b2bb8427a7b7a23d3b0441d6e7c5d (diff) | |
| download | rust-5b1bfaed8c387ff36200ad789a4a215680fbff79.tar.gz rust-5b1bfaed8c387ff36200ad789a4a215680fbff79.zip | |
[debuginfo] Adapt CDB tests after changes to whitespace usage in debuginfo type names.
| -rw-r--r-- | src/test/debuginfo/generic-struct.rs | 10 | ||||
| -rw-r--r-- | src/test/debuginfo/msvc-pretty-enums.rs | 4 | ||||
| -rw-r--r-- | src/test/debuginfo/pretty-std-collections-hash.rs | 4 | ||||
| -rw-r--r-- | src/test/debuginfo/pretty-std.rs | 2 | ||||
| -rw-r--r-- | src/test/debuginfo/result-types.rs | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/test/debuginfo/generic-struct.rs b/src/test/debuginfo/generic-struct.rs index c0135de1219..5fa5ce80099 100644 --- a/src/test/debuginfo/generic-struct.rs +++ b/src/test/debuginfo/generic-struct.rs @@ -44,21 +44,21 @@ // cdb-command:g // cdb-command:dx int_int -// cdb-check:int_int [Type: generic_struct::AGenericStruct<i32, i32>] +// cdb-check:int_int [Type: generic_struct::AGenericStruct<i32,i32>] // cdb-check:[...]key : 0 [Type: int] // cdb-check:[...]value : 1 [Type: int] // cdb-command:dx int_float -// cdb-check:int_float [Type: generic_struct::AGenericStruct<i32, f64>] +// cdb-check:int_float [Type: generic_struct::AGenericStruct<i32,f64>] // cdb-check:[...]key : 2 [Type: int] // cdb-check:[...]value : 3.500000 [Type: double] // cdb-command:dx float_int -// cdb-check:float_int [Type: generic_struct::AGenericStruct<f64, i32>] +// cdb-check:float_int [Type: generic_struct::AGenericStruct<f64,i32>] // cdb-check:[...]key : 4.500000 [Type: double] // cdb-check:[...]value : 5 [Type: int] // cdb-command:dx float_int_float -// cdb-check:float_int_float [Type: generic_struct::AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64> >] +// cdb-check:float_int_float [Type: generic_struct::AGenericStruct<f64,generic_struct::AGenericStruct<i32,f64> >] // cdb-check:[...]key : 6.500000 [Type: double] -// cdb-check:[...]value [Type: generic_struct::AGenericStruct<i32, f64>] +// cdb-check:[...]value [Type: generic_struct::AGenericStruct<i32,f64>] #![feature(omit_gdb_pretty_printer_section)] diff --git a/src/test/debuginfo/msvc-pretty-enums.rs b/src/test/debuginfo/msvc-pretty-enums.rs index f248fcd8391..9463f82c797 100644 --- a/src/test/debuginfo/msvc-pretty-enums.rs +++ b/src/test/debuginfo/msvc-pretty-enums.rs @@ -87,8 +87,8 @@ // cdb-check: [+0x000] discriminant : 0x[...] [Type: enum$<core::option::Option<alloc::string::String>, 1, [...], Some>::Discriminant$] // cdb-command: dx -r2 l,! -// cdb-check:l,! : $T2 [Type: enum$<core::result::Result<u32, enum$<msvc_pretty_enums::Empty> >, Ok>] -// cdb-check: [+0x000] Ok [Type: enum$<core::result::Result<u32, enum$<msvc_pretty_enums::Empty> >, Ok>::Ok] +// cdb-check:l,! : $T2 [Type: enum$<core::result::Result<u32,enum$<msvc_pretty_enums::Empty> >, Ok>] +// cdb-check: [+0x000] Ok [Type: enum$<core::result::Result<u32,enum$<msvc_pretty_enums::Empty> >, Ok>::Ok] // cdb-check: [+0x000] __0 : 0x2a [Type: unsigned int] pub enum CStyleEnum { diff --git a/src/test/debuginfo/pretty-std-collections-hash.rs b/src/test/debuginfo/pretty-std-collections-hash.rs index ede15578712..40bde860699 100644 --- a/src/test/debuginfo/pretty-std-collections-hash.rs +++ b/src/test/debuginfo/pretty-std-collections-hash.rs @@ -10,7 +10,7 @@ // cdb-command: g // cdb-command: dx hash_set,d -// cdb-check:hash_set,d [...] : { len=15 } [Type: [...]::HashSet<u64, [...]>] +// cdb-check:hash_set,d [...] : { len=15 } [Type: [...]::HashSet<u64,[...]>] // cdb-check: [len] : 15 [Type: [...]] // cdb-check: [capacity] : [...] // cdb-check: [[...]] [...] : 0 [Type: u64] @@ -44,7 +44,7 @@ // cdb-check: [[...]] [...] : 14 [Type: u64] // cdb-command: dx hash_map,d -// cdb-check:hash_map,d [...] : { len=15 } [Type: [...]::HashMap<u64, u64, [...]>] +// cdb-check:hash_map,d [...] : { len=15 } [Type: [...]::HashMap<u64,u64,[...]>] // cdb-check: [len] : 15 [Type: [...]] // cdb-check: [capacity] : [...] // cdb-check: ["0x0"] : 0 [Type: unsigned __int64] diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs index 7ed76beb8c6..2f6174e4159 100644 --- a/src/test/debuginfo/pretty-std.rs +++ b/src/test/debuginfo/pretty-std.rs @@ -79,7 +79,7 @@ // cdb-check: [3] : 3 [Type: int] // cdb-command: dx vec,d -// cdb-check:vec,d [...] : { len=4 } [Type: [...]::Vec<u64, alloc::alloc::Global>] +// cdb-check:vec,d [...] : { len=4 } [Type: [...]::Vec<u64,alloc::alloc::Global>] // cdb-check: [len] : 4 [Type: [...]] // cdb-check: [capacity] : [...] [Type: [...]] // cdb-check: [0] : 4 [Type: unsigned __int64] diff --git a/src/test/debuginfo/result-types.rs b/src/test/debuginfo/result-types.rs index a075c437c46..c0d905a6acc 100644 --- a/src/test/debuginfo/result-types.rs +++ b/src/test/debuginfo/result-types.rs @@ -7,11 +7,11 @@ // cdb-command: g // cdb-command: dx x,d -// cdb-check:x,d : Ok [Type: enum$<core::result::Result<i32, str> >] +// cdb-check:x,d : Ok [Type: enum$<core::result::Result<i32,str> >] // cdb-check: [...] __0 : -3 [Type: int] // cdb-command: dx y -// cdb-check:y : Err [Type: enum$<core::result::Result<i32, str> >] +// cdb-check:y : Err [Type: enum$<core::result::Result<i32,str> >] // cdb-check: [...] __0 : "Some error message" [Type: str] fn main() |