diff --git a/src/test/debuginfo/associated-types.rs b/src/test/debuginfo/associated-types.rs
index ccd94022711cd..c1db97e8a387f 100644
--- a/src/test/debuginfo/associated-types.rs
+++ b/src/test/debuginfo/associated-types.rs
@@ -17,7 +17,7 @@
 
 // gdb-command:print arg
 // gdbg-check:$1 = {b = -1, b1 = 0}
-// gdbr-check:$1 = associated_types::Struct<i32> {b: -1, b1: 0}
+// gdbr-check:$1 = Struct<i32> = {b = -1, b1 = 0}
 // gdb-command:continue
 
 // gdb-command:print inferred
@@ -32,7 +32,7 @@
 
 // gdb-command:print arg
 // gdbg-check:$5 = {__0 = 4, __1 = 5}
-// gdbr-check:$5 = (4, 5)
+// gdbr-check:$5 = {4, 5}
 // gdb-command:continue
 
 // gdb-command:print a
diff --git a/src/test/debuginfo/borrowed-enum.rs b/src/test/debuginfo/borrowed-enum.rs
index 9e63beff3cb2e..99ca24a9b5102 100644
--- a/src/test/debuginfo/borrowed-enum.rs
+++ b/src/test/debuginfo/borrowed-enum.rs
@@ -20,15 +20,15 @@
 
 // gdb-command:print *the_a_ref
 // gdbg-check:$1 = {{RUST$ENUM$DISR = TheA, x = 0, y = 8970181431921507452}, {RUST$ENUM$DISR = TheA, [...]}}
-// gdbr-check:$1 = borrowed_enum::ABC::TheA{x: 0, y: 8970181431921507452}
+// gdbr-check:$1 = TheA = {x = 0, y = 8970181431921507452}
 
 // gdb-command:print *the_b_ref
 // gdbg-check:$2 = {{RUST$ENUM$DISR = TheB, [...]}, {RUST$ENUM$DISR = TheB, __0 = 0, __1 = 286331153, __2 = 286331153}}
-// gdbr-check:$2 = borrowed_enum::ABC::TheB(0, 286331153, 286331153)
+// gdbr-check:$2 = TheB = {0, 286331153, 286331153}
 
 // gdb-command:print *univariant_ref
 // gdbg-check:$3 = {{__0 = 4820353753753434}}
-// gdbr-check:$3 = borrowed_enum::Univariant::TheOnlyCase(4820353753753434)
+// gdbr-check:$3 = TheOnlyCase = {4820353753753434}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/borrowed-struct.rs b/src/test/debuginfo/borrowed-struct.rs
index 01428e515e27f..ac1db68217b71 100644
--- a/src/test/debuginfo/borrowed-struct.rs
+++ b/src/test/debuginfo/borrowed-struct.rs
@@ -17,7 +17,7 @@
 
 // gdb-command:print *stack_val_ref
 // gdbg-check:$1 = {x = 10, y = 23.5}
-// gdbr-check:$1 = borrowed_struct::SomeStruct {x: 10, y: 23.5}
+// gdbr-check:$1 = SomeStruct = {x = 10, y = 23.5}
 
 // gdb-command:print *stack_val_interior_ref_1
 // gdb-check:$2 = 10
@@ -27,11 +27,11 @@
 
 // gdb-command:print *ref_to_unnamed
 // gdbg-check:$4 = {x = 11, y = 24.5}
-// gdbr-check:$4 = borrowed_struct::SomeStruct {x: 11, y: 24.5}
+// gdbr-check:$4 = SomeStruct = {x = 11, y = 24.5}
 
 // gdb-command:print *unique_val_ref
 // gdbg-check:$5 = {x = 13, y = 26.5}
-// gdbr-check:$5 = borrowed_struct::SomeStruct {x: 13, y: 26.5}
+// gdbr-check:$5 = SomeStruct = {x = 13, y = 26.5}
 
 // gdb-command:print *unique_val_interior_ref_1
 // gdb-check:$6 = 13
diff --git a/src/test/debuginfo/borrowed-tuple.rs b/src/test/debuginfo/borrowed-tuple.rs
index 17db88ee37f53..fd4c272793fc1 100644
--- a/src/test/debuginfo/borrowed-tuple.rs
+++ b/src/test/debuginfo/borrowed-tuple.rs
@@ -18,15 +18,15 @@
 
 // gdb-command:print *stack_val_ref
 // gdbg-check:$1 = {__0 = -14, __1 = -19}
-// gdbr-check:$1 = (-14, -19)
+// gdbr-check:$1 = {-14, -19}
 
 // gdb-command:print *ref_to_unnamed
 // gdbg-check:$2 = {__0 = -15, __1 = -20}
-// gdbr-check:$2 = (-15, -20)
+// gdbr-check:$2 = {-15, -20}
 
 // gdb-command:print *unique_val_ref
 // gdbg-check:$3 = {__0 = -17, __1 = -22}
-// gdbr-check:$3 = (-17, -22)
+// gdbr-check:$3 = {-17, -22}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/box.rs b/src/test/debuginfo/box.rs
index 98c09fe09de8f..d83511dbf7c21 100644
--- a/src/test/debuginfo/box.rs
+++ b/src/test/debuginfo/box.rs
@@ -20,7 +20,7 @@
 // gdb-check:$1 = 1
 // gdb-command:print *b
 // gdbg-check:$2 = {__0 = 2, __1 = 3.5}
-// gdbr-check:$2 = (2, 3.5)
+// gdbr-check:$2 = {2, 3.5}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/boxed-struct.rs b/src/test/debuginfo/boxed-struct.rs
index ac091b4a533db..6a56d9b6b3ccd 100644
--- a/src/test/debuginfo/boxed-struct.rs
+++ b/src/test/debuginfo/boxed-struct.rs
@@ -18,11 +18,11 @@
 
 // gdb-command:print *unique
 // gdbg-check:$1 = {x = 99, y = 999, z = 9999, w = 99999}
-// gdbr-check:$1 = boxed_struct::StructWithSomePadding {x: 99, y: 999, z: 9999, w: 99999}
+// gdbr-check:$1 = StructWithSomePadding = {x = 99, y = 999, z = 9999, w = 99999}
 
 // gdb-command:print *unique_dtor
 // gdbg-check:$2 = {x = 77, y = 777, z = 7777, w = 77777}
-// gdbr-check:$2 = boxed_struct::StructWithDestructor {x: 77, y: 777, z: 7777, w: 77777}
+// gdbr-check:$2 = StructWithDestructor = {x = 77, y = 777, z = 7777, w = 77777}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/by-value-non-immediate-argument.rs b/src/test/debuginfo/by-value-non-immediate-argument.rs
index 0fe08c3a22731..0d795e3b38fad 100644
--- a/src/test/debuginfo/by-value-non-immediate-argument.rs
+++ b/src/test/debuginfo/by-value-non-immediate-argument.rs
@@ -19,12 +19,12 @@
 
 // gdb-command:print s
 // gdbg-check:$1 = {a = 1, b = 2.5}
-// gdbr-check:$1 = by_value_non_immediate_argument::Struct {a: 1, b: 2.5}
+// gdbr-check:$1 = Struct = {a = 1, b = 2.5}
 // gdb-command:continue
 
 // gdb-command:print x
 // gdbg-check:$2 = {a = 3, b = 4.5}
-// gdbr-check:$2 = by_value_non_immediate_argument::Struct {a: 3, b: 4.5}
+// gdbr-check:$2 = Struct = {a = 3, b = 4.5}
 // gdb-command:print y
 // gdb-check:$3 = 5
 // gdb-command:print z
@@ -33,17 +33,17 @@
 
 // gdb-command:print a
 // gdbg-check:$5 = {__0 = 7, __1 = 8, __2 = 9.5, __3 = 10.5}
-// gdbr-check:$5 = (7, 8, 9.5, 10.5)
+// gdbr-check:$5 = {7, 8, 9.5, 10.5}
 // gdb-command:continue
 
 // gdb-command:print a
 // gdbg-check:$6 = {__0 = 11.5, __1 = 12.5, __2 = 13, __3 = 14}
-// gdbr-check:$6 = by_value_non_immediate_argument::Newtype (11.5, 12.5, 13, 14)
+// gdbr-check:$6 = Newtype = {11.5, 12.5, 13, 14}
 // gdb-command:continue
 
 // gdb-command:print x
 // gdbg-check:$7 = {{RUST$ENUM$DISR = Case1, x = 0, y = 8970181431921507452}, {RUST$ENUM$DISR = Case1, [...]}}
-// gdbr-check:$7 = by_value_non_immediate_argument::Enum::Case1{x: 0, y: 8970181431921507452}
+// gdbr-check:$7 = Case1 = {x = 0, y = 8970181431921507452}
 // gdb-command:continue
 
 
diff --git a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs b/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs
index c14f8c7b354fc..7fc41815debdd 100644
--- a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs
+++ b/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs
@@ -22,12 +22,12 @@
 
 // gdb-command:print self
 // gdbg-check:$2 = {x = 2222, y = 3333}
-// gdbr-check:$2 = by_value_self_argument_in_trait_impl::Struct {x: 2222, y: 3333}
+// gdbr-check:$2 = Struct = {x = 2222, y = 3333}
 // gdb-command:continue
 
 // gdb-command:print self
 // gdbg-check:$3 = {__0 = 4444.5, __1 = 5555, __2 = 6666, __3 = 7777.5}
-// gdbr-check:$3 = (4444.5, 5555, 6666, 7777.5)
+// gdbr-check:$3 = {4444.5, 5555, 6666, 7777.5}
 // gdb-command:continue
 
 
diff --git a/src/test/debuginfo/c-style-enum-in-composite.rs b/src/test/debuginfo/c-style-enum-in-composite.rs
index 004e15d1cc6c1..6c38e1672b211 100644
--- a/src/test/debuginfo/c-style-enum-in-composite.rs
+++ b/src/test/debuginfo/c-style-enum-in-composite.rs
@@ -19,31 +19,31 @@
 
 // gdb-command:print tuple_interior_padding
 // gdbg-check:$1 = {__0 = 0, __1 = OneHundred}
-// gdbr-check:$1 = (0, c_style_enum_in_composite::AnEnum::OneHundred)
+// gdbr-check:$1 = {0, c_style_enum_in_composite::AnEnum::OneHundred}
 
 // gdb-command:print tuple_padding_at_end
 // gdbg-check:$2 = {__0 = {__0 = 1, __1 = OneThousand}, __1 = 2}
-// gdbr-check:$2 = ((1, c_style_enum_in_composite::AnEnum::OneThousand), 2)
+// gdbr-check:$2 = {{1, c_style_enum_in_composite::AnEnum::OneThousand}, 2}
 
 // gdb-command:print tuple_different_enums
 // gdbg-check:$3 = {__0 = OneThousand, __1 = MountainView, __2 = OneMillion, __3 = Vienna}
-// 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)
+// 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-command:print padded_struct
 // gdbg-check:$4 = {a = 3, b = OneMillion, c = 4, d = Toronto, e = 5}
-// 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}
+// gdbr-check:$4 = 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
 // gdbg-check:$5 = {a = 6, b = OneHundred, c = 7, d = Vienna, e = 8}
-// 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}
+// gdbr-check:$5 = 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
 // gdbg-check:$6 = {a = OneMillion, b = MountainView, c = OneThousand, d = Toronto}
-// 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}
+// gdbr-check:$6 = 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
 // gdbg-check:$7 = {__0 = {a = OneHundred, b = Vienna}, __1 = 9}
-// 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)
+// gdbr-check:$7 = {StructWithDrop = {a = c_style_enum_in_composite::AnEnum::OneHundred, b = c_style_enum_in_composite::AnotherEnum::Vienna}, 9}
 
 // === LLDB TESTS ==================================================================================
 
diff --git a/src/test/debuginfo/cross-crate-spans.rs b/src/test/debuginfo/cross-crate-spans.rs
index 28728df928051..48bf0792bc3df 100644
--- a/src/test/debuginfo/cross-crate-spans.rs
+++ b/src/test/debuginfo/cross-crate-spans.rs
@@ -26,7 +26,7 @@ extern crate cross_crate_spans;
 
 // gdb-command:print result
 // gdbg-check:$1 = {__0 = 17, __1 = 17}
-// gdbr-check:$1 = (17, 17)
+// gdbr-check:$1 = {17, 17}
 // gdb-command:print a_variable
 // gdb-check:$2 = 123456789
 // gdb-command:print another_variable
@@ -35,7 +35,7 @@ extern crate cross_crate_spans;
 
 // gdb-command:print result
 // gdbg-check:$4 = {__0 = 1212, __1 = 1212}
-// gdbr-check:$4 = (1212, 1212)
+// gdbr-check:$4 = {1212, 1212}
 // gdb-command:print a_variable
 // gdb-check:$5 = 123456789
 // gdb-command:print another_variable
diff --git a/src/test/debuginfo/destructured-fn-argument.rs b/src/test/debuginfo/destructured-fn-argument.rs
index efa9ee59b22b2..c1b9db024d1b4 100644
--- a/src/test/debuginfo/destructured-fn-argument.rs
+++ b/src/test/debuginfo/destructured-fn-argument.rs
@@ -34,14 +34,14 @@
 // gdb-check:$6 = 5
 // gdb-command:print b
 // gdbg-check:$7 = {__0 = 6, __1 = 7}
-// gdbr-check:$7 = (6, 7)
+// gdbr-check:$7 = {6, 7}
 // gdb-command:continue
 
 // gdb-command:print h
 // gdb-check:$8 = 8
 // gdb-command:print i
 // gdbg-check:$9 = {a = 9, b = 10}
-// gdbr-check:$9 = destructured_fn_argument::Struct {a: 9, b: 10}
+// gdbr-check:$9 = Struct = {a = 9, b = 10}
 // gdb-command:print j
 // gdb-check:$10 = 11
 // gdb-command:continue
@@ -68,7 +68,7 @@
 // gdb-check:$17 = 20
 // gdb-command:print r
 // gdbg-check:$18 = {a = 21, b = 22}
-// gdbr-check:$18 = destructured_fn_argument::Struct {a: 21, b: 22}
+// gdbr-check:$18 = Struct = {a = 21, b = 22}
 // gdb-command:continue
 
 // gdb-command:print s
@@ -99,12 +99,12 @@
 
 // gdb-command:print aa
 // gdbg-check:$30 = {__0 = 34, __1 = 35}
-// gdbr-check:$30 = (34, 35)
+// gdbr-check:$30 = {34, 35}
 // gdb-command:continue
 
 // gdb-command:print bb
 // gdbg-check:$31 = {__0 = 36, __1 = 37}
-// gdbr-check:$31 = (36, 37)
+// gdbr-check:$31 = {36, 37}
 // gdb-command:continue
 
 // gdb-command:print cc
@@ -113,19 +113,19 @@
 
 // gdb-command:print dd
 // gdbg-check:$33 = {__0 = 40, __1 = 41, __2 = 42}
-// gdbr-check:$33 = (40, 41, 42)
+// gdbr-check:$33 = {40, 41, 42}
 // gdb-command:continue
 
 // gdb-command:print *ee
 // gdbg-check:$34 = {__0 = 43, __1 = 44, __2 = 45}
-// gdbr-check:$34 = (43, 44, 45)
+// gdbr-check:$34 = {43, 44, 45}
 // gdb-command:continue
 
 // gdb-command:print *ff
 // gdb-check:$35 = 46
 // gdb-command:print gg
 // gdbg-check:$36 = {__0 = 47, __1 = 48}
-// gdbr-check:$36 = (47, 48)
+// gdbr-check:$36 = {47, 48}
 // gdb-command:continue
 
 // gdb-command:print *hh
diff --git a/src/test/debuginfo/destructured-for-loop-variable.rs b/src/test/debuginfo/destructured-for-loop-variable.rs
index e973c22fd4a85..d346f090304f6 100644
--- a/src/test/debuginfo/destructured-for-loop-variable.rs
+++ b/src/test/debuginfo/destructured-for-loop-variable.rs
@@ -74,12 +74,12 @@
 
 // gdb-command:print simple_struct_ident
 // gdbg-check:$23 = {x = 3537, y = 35437.5, z = true}
-// gdbr-check:$23 = destructured_for_loop_variable::Struct {x: 3537, y: 35437.5, z: true}
+// gdbr-check:$23 = Struct = {x = 3537, y = 35437.5, z = true}
 // gdb-command:continue
 
 // gdb-command:print simple_tuple_ident
 // gdbg-check:$24 = {__0 = 34903493, __1 = 232323}
-// gdbr-check:$24 = (34903493, 232323)
+// gdbr-check:$24 = {34903493, 232323}
 // gdb-command:continue
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/destructured-local.rs b/src/test/debuginfo/destructured-local.rs
index 1f18b77ab8f6f..4058fceb7b926 100644
--- a/src/test/debuginfo/destructured-local.rs
+++ b/src/test/debuginfo/destructured-local.rs
@@ -32,13 +32,13 @@
 // gdb-check:$6 = 5
 // gdb-command:print g
 // gdbg-check:$7 = {__0 = 6, __1 = 7}
-// gdbr-check:$7 = (6, 7)
+// gdbr-check:$7 = {6, 7}
 
 // gdb-command:print h
 // gdb-check:$8 = 8
 // gdb-command:print i
 // gdbg-check:$9 = {a = 9, b = 10}
-// gdbr-check:$9 = destructured_local::Struct {a: 9, b: 10}
+// gdbr-check:$9 = Struct = {a = 9, b = 10}
 // gdb-command:print j
 // gdb-check:$10 = 11
 
@@ -61,7 +61,7 @@
 // gdb-check:$17 = 20
 // gdb-command:print r
 // gdbg-check:$18 = {a = 21, b = 22}
-// gdbr-check:$18 = destructured_local::Struct {a: 21, b: 22}
+// gdbr-check:$18 = Struct = {a = 21, b = 22}
 
 // gdb-command:print s
 // gdb-check:$19 = 24
@@ -89,29 +89,29 @@
 
 // gdb-command:print aa
 // gdbg-check:$30 = {__0 = 34, __1 = 35}
-// gdbr-check:$30 = (34, 35)
+// gdbr-check:$30 = {34, 35}
 
 // gdb-command:print bb
 // gdbg-check:$31 = {__0 = 36, __1 = 37}
-// gdbr-check:$31 = (36, 37)
+// gdbr-check:$31 = {36, 37}
 
 // gdb-command:print cc
 // gdb-check:$32 = 38
 
 // gdb-command:print dd
 // gdbg-check:$33 = {__0 = 40, __1 = 41, __2 = 42}
-// gdbr-check:$33 = (40, 41, 42)
+// gdbr-check:$33 = {40, 41, 42}
 
 // gdb-command:print *ee
 // gdbg-check:$34 = {__0 = 43, __1 = 44, __2 = 45}
-// gdbr-check:$34 = (43, 44, 45)
+// gdbr-check:$34 = {43, 44, 45}
 
 // gdb-command:print *ff
 // gdb-check:$35 = 46
 
 // gdb-command:print gg
 // gdbg-check:$36 = {__0 = 47, __1 = 48}
-// gdbr-check:$36 = (47, 48)
+// gdbr-check:$36 = {47, 48}
 
 // gdb-command:print *hh
 // gdb-check:$37 = 50
diff --git a/src/test/debuginfo/evec-in-struct.rs b/src/test/debuginfo/evec-in-struct.rs
index 2e151577590b3..9fe20eff6a89c 100644
--- a/src/test/debuginfo/evec-in-struct.rs
+++ b/src/test/debuginfo/evec-in-struct.rs
@@ -18,22 +18,22 @@
 
 // gdb-command:print no_padding1
 // gdbg-check:$1 = {x = {0, 1, 2}, y = -3, z = {4.5, 5.5}}
-// gdbr-check:$1 = evec_in_struct::NoPadding1 {x: [0, 1, 2], y: -3, z: [4.5, 5.5]}
+// gdbr-check:$1 = NoPadding1 = {x = [0, 1, 2], y = -3, z = [4.5, 5.5]}
 // gdb-command:print no_padding2
 // gdbg-check:$2 = {x = {6, 7, 8}, y = {{9, 10}, {11, 12}}}
-// gdbr-check:$2 = evec_in_struct::NoPadding2 {x: [6, 7, 8], y: [[9, 10], [11, 12]]}
+// gdbr-check:$2 = NoPadding2 = {x = [6, 7, 8], y = [[9, 10], [11, 12]]}
 
 // gdb-command:print struct_internal_padding
 // gdbg-check:$3 = {x = {13, 14}, y = {15, 16}}
-// gdbr-check:$3 = evec_in_struct::StructInternalPadding {x: [13, 14], y: [15, 16]}
+// gdbr-check:$3 = StructInternalPadding = {x = [13, 14], y = [15, 16]}
 
 // gdb-command:print single_vec
 // gdbg-check:$4 = {x = {17, 18, 19, 20, 21}}
-// gdbr-check:$4 = evec_in_struct::SingleVec {x: [17, 18, 19, 20, 21]}
+// gdbr-check:$4 = SingleVec = {x = [17, 18, 19, 20, 21]}
 
 // gdb-command:print struct_padded_at_end
 // gdbg-check:$5 = {x = {22, 23}, y = {24, 25}}
-// gdbr-check:$5 = evec_in_struct::StructPaddedAtEnd {x: [22, 23], y: [24, 25]}
+// gdbr-check:$5 = StructPaddedAtEnd = {x = [22, 23], y = [24, 25]}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs b/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs
index 1fc05b3752f04..6b99742389b0d 100644
--- a/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs
+++ b/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs
@@ -19,36 +19,36 @@
 
 // gdb-command:print eight_bytes1
 // gdbg-check:$1 = {{RUST$ENUM$DISR = Variant1, __0 = 100}, {RUST$ENUM$DISR = Variant1, __0 = 100}}
-// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum::Variant1(100)
+// gdbr-check:$1 = Variant1 = {100}
 
 // gdb-command:print four_bytes1
 // gdbg-check:$2 = {{RUST$ENUM$DISR = Variant1, __0 = 101}, {RUST$ENUM$DISR = Variant1, __0 = 101}}
-// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum::Variant1(101)
+// gdbr-check:$2 = Variant1 = {101}
 
 // gdb-command:print two_bytes1
 // gdbg-check:$3 = {{RUST$ENUM$DISR = Variant1, __0 = 102}, {RUST$ENUM$DISR = Variant1, __0 = 102}}
-// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum::Variant1(102)
+// gdbr-check:$3 = Variant1 = {102}
 
 // gdb-command:print one_byte1
 // gdbg-check:$4 = {{RUST$ENUM$DISR = Variant1, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant1, __0 = 65 'A'}}
-// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum::Variant1(65)
+// gdbr-check:$4 = Variant1 = {65}
 
 
 // gdb-command:print eight_bytes2
 // gdbg-check:$5 = {{RUST$ENUM$DISR = Variant2, __0 = 100}, {RUST$ENUM$DISR = Variant2, __0 = 100}}
-// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum::Variant2(100)
+// gdbr-check:$5 = Variant2 = {100}
 
 // gdb-command:print four_bytes2
 // gdbg-check:$6 = {{RUST$ENUM$DISR = Variant2, __0 = 101}, {RUST$ENUM$DISR = Variant2, __0 = 101}}
-// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum::Variant2(101)
+// gdbr-check:$6 = Variant2 = {101}
 
 // gdb-command:print two_bytes2
 // gdbg-check:$7 = {{RUST$ENUM$DISR = Variant2, __0 = 102}, {RUST$ENUM$DISR = Variant2, __0 = 102}}
-// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum::Variant2(102)
+// gdbr-check:$7 = Variant2 = {102}
 
 // gdb-command:print one_byte2
 // gdbg-check:$8 = {{RUST$ENUM$DISR = Variant2, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant2, __0 = 65 'A'}}
-// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum::Variant2(65)
+// gdbr-check:$8 = Variant2 = {65}
 
 // gdb-command:continue
 
diff --git a/src/test/debuginfo/generic-function.rs b/src/test/debuginfo/generic-function.rs
index f1bfc08915edd..36ab292ee6afd 100644
--- a/src/test/debuginfo/generic-function.rs
+++ b/src/test/debuginfo/generic-function.rs
@@ -24,7 +24,7 @@
 // gdb-check:$2 = 2.5
 // gdb-command:print ret
 // gdbg-check:$3 = {__0 = {__0 = 1, __1 = 2.5}, __1 = {__0 = 2.5, __1 = 1}}
-// gdbr-check:$3 = ((1, 2.5), (2.5, 1))
+// gdbr-check:$3 = {{1, 2.5}, {2.5, 1}}
 // gdb-command:continue
 
 // gdb-command:print *t0
@@ -33,17 +33,17 @@
 // gdb-check:$5 = 4
 // gdb-command:print ret
 // gdbg-check:$6 = {__0 = {__0 = 3.5, __1 = 4}, __1 = {__0 = 4, __1 = 3.5}}
-// gdbr-check:$6 = ((3.5, 4), (4, 3.5))
+// gdbr-check:$6 = {{3.5, 4}, {4, 3.5}}
 // gdb-command:continue
 
 // gdb-command:print *t0
 // gdb-check:$7 = 5
 // gdb-command:print *t1
 // gdbg-check:$8 = {a = 6, b = 7.5}
-// gdbr-check:$8 = generic_function::Struct {a: 6, b: 7.5}
+// gdbr-check:$8 = Struct = {a = 6, b = 7.5}
 // gdb-command:print ret
 // gdbg-check:$9 = {__0 = {__0 = 5, __1 = {a = 6, b = 7.5}}, __1 = {__0 = {a = 6, b = 7.5}, __1 = 5}}
-// gdbr-check:$9 = ((5, generic_function::Struct {a: 6, b: 7.5}), (generic_function::Struct {a: 6, b: 7.5}, 5))
+// gdbr-check:$9 = {{5, Struct = {a = 6, b = 7.5}}, {Struct = {a = 6, b = 7.5}, 5}}
 // gdb-command:continue
 
 
diff --git a/src/test/debuginfo/generic-method-on-generic-struct.rs b/src/test/debuginfo/generic-method-on-generic-struct.rs
index 4f3f6dfc821ee..2f2a3200c89c1 100644
--- a/src/test/debuginfo/generic-method-on-generic-struct.rs
+++ b/src/test/debuginfo/generic-method-on-generic-struct.rs
@@ -19,7 +19,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {x = {__0 = 8888, __1 = -8888}}
-// gdbr-check:$1 = generic_method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdbr-check:$1 = Struct<(u32, i32)> = {x = {8888, -8888}}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -29,7 +29,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {x = {__0 = 8888, __1 = -8888}}
-// gdbr-check:$4 = generic_method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdbr-check:$4 = Struct<(u32, i32)> = {x = {8888, -8888}}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -39,7 +39,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {x = 1234.5}
-// gdbr-check:$7 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdbr-check:$7 = Struct<f64> = {x = 1234.5}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -49,7 +49,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {x = 1234.5}
-// gdbr-check:$10 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdbr-check:$10 = Struct<f64> = {x = 1234.5}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -59,7 +59,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {x = 1234.5}
-// gdbr-check:$13 = generic_method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdbr-check:$13 = Struct<f64> = {x = 1234.5}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/generic-struct-style-enum.rs b/src/test/debuginfo/generic-struct-style-enum.rs
index 4a1d14ccf6118..07e7e05719853 100644
--- a/src/test/debuginfo/generic-struct-style-enum.rs
+++ b/src/test/debuginfo/generic-struct-style-enum.rs
@@ -19,19 +19,19 @@
 
 // gdb-command:print case1
 // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, a = 0, b = 31868, c = 31868, d = 31868, e = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}}
-// gdbr-check:$1 = generic_struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868}
+// gdbr-check:$1 = Case1 = {a = 0, b = 31868, c = 31868, d = 31868, e = 31868}
 
 // gdb-command:print case2
 // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, a = 0, b = 286331153, c = 286331153}, {RUST$ENUM$DISR = Case2, [...]}}
-// gdbr-check:$2 = generic_struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153}
+// gdbr-check:$2 = Case2 = {a = 0, b = 286331153, c = 286331153}
 
 // gdb-command:print case3
 // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, a = 0, b = 6438275382588823897}}
-// gdbr-check:$3 = generic_struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897}
+// gdbr-check:$3 = Case3 = {a = 0, b = 6438275382588823897}
 
 // gdb-command:print univariant
 // gdbg-check:$4 = {{a = -1}}
-// gdbr-check:$4 = generic_struct_style_enum::Univariant<i32>::TheOnlyCase{a: -1}
+// gdbr-check:$4 = TheOnlyCase = {a = -1}
 
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/src/test/debuginfo/generic-struct.rs b/src/test/debuginfo/generic-struct.rs
index 35f00ce78717b..93cbe09dd9244 100644
--- a/src/test/debuginfo/generic-struct.rs
+++ b/src/test/debuginfo/generic-struct.rs
@@ -19,16 +19,16 @@
 
 // gdb-command:print int_int
 // gdbg-check:$1 = {key = 0, value = 1}
-// gdbr-check:$1 = generic_struct::AGenericStruct<i32, i32> {key: 0, value: 1}
+// gdbr-check:$1 = AGenericStruct<i32, i32> = {key = 0, value = 1}
 // gdb-command:print int_float
 // gdbg-check:$2 = {key = 2, value = 3.5}
-// gdbr-check:$2 = generic_struct::AGenericStruct<i32, f64> {key: 2, value: 3.5}
+// gdbr-check:$2 = AGenericStruct<i32, f64> = {key = 2, value = 3.5}
 // gdb-command:print float_int
 // gdbg-check:$3 = {key = 4.5, value = 5}
-// gdbr-check:$3 = generic_struct::AGenericStruct<f64, i32> {key: 4.5, value: 5}
+// gdbr-check:$3 = AGenericStruct<f64, i32> = {key = 4.5, value = 5}
 // gdb-command:print float_int_float
 // gdbg-check:$4 = {key = 6.5, value = {key = 7, value = 8.5}}
-// 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}}
+// gdbr-check:$4 = AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> = {key = 6.5, value = AGenericStruct<i32, f64> = {key = 7, value = 8.5}}
 
 // === LLDB TESTS ==================================================================================
 
diff --git a/src/test/debuginfo/generic-tuple-style-enum.rs b/src/test/debuginfo/generic-tuple-style-enum.rs
index 012bd6140cdbe..f6c97f5d3ed02 100644
--- a/src/test/debuginfo/generic-tuple-style-enum.rs
+++ b/src/test/debuginfo/generic-tuple-style-enum.rs
@@ -21,19 +21,19 @@
 
 // gdb-command:print case1
 // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, __0 = 0, __1 = 31868, __2 = 31868, __3 = 31868, __4 = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}}
-// gdbr-check:$1 = generic_tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868)
+// gdbr-check:$1 = Case1 = {0, 31868, 31868, 31868, 31868}
 
 // gdb-command:print case2
 // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, __0 = 0, __1 = 286331153, __2 = 286331153}, {RUST$ENUM$DISR = Case2, [...]}}
-// gdbr-check:$2 = generic_tuple_style_enum::Regular::Case2(0, 286331153, 286331153)
+// gdbr-check:$2 = Case2 = {0, 286331153, 286331153}
 
 // gdb-command:print case3
 // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, __0 = 0, __1 = 6438275382588823897}}
-// gdbr-check:$3 = generic_tuple_style_enum::Regular::Case3(0, 6438275382588823897)
+// gdbr-check:$3 = Case3 = {0, 6438275382588823897}
 
 // gdb-command:print univariant
 // gdbg-check:$4 = {{__0 = -1}}
-// gdbr-check:$4 = generic_tuple_style_enum::Univariant<i64>::TheOnlyCase(-1)
+// gdbr-check:$4 = TheOnlyCase = {-1}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/method-on-enum.rs b/src/test/debuginfo/method-on-enum.rs
index 7dbc0d3c5130d..c35fe8052c96d 100644
--- a/src/test/debuginfo/method-on-enum.rs
+++ b/src/test/debuginfo/method-on-enum.rs
@@ -20,7 +20,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {{RUST$ENUM$DISR = Variant2, [...]}, {RUST$ENUM$DISR = Variant2, __0 = 117901063}}
-// gdbr-check:$1 = method_on_enum::Enum::Variant2(117901063)
+// gdbr-check:$1 = Variant2 = {117901063}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -30,7 +30,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {{RUST$ENUM$DISR = Variant2, [...]}, {RUST$ENUM$DISR = Variant2, __0 = 117901063}}
-// gdbr-check:$4 = method_on_enum::Enum::Variant2(117901063)
+// gdbr-check:$4 = Variant2 = {117901063}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -40,7 +40,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {{RUST$ENUM$DISR = Variant1, x = 1799, y = 1799}, {RUST$ENUM$DISR = Variant1, [...]}}
-// gdbr-check:$7 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
+// gdbr-check:$7 = Variant1 = {x = 1799, y = 1799}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -50,7 +50,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {{RUST$ENUM$DISR = Variant1, x = 1799, y = 1799}, {RUST$ENUM$DISR = Variant1, [...]}}
-// gdbr-check:$10 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
+// gdbr-check:$10 = Variant1 = {x = 1799, y = 1799}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -60,7 +60,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {{RUST$ENUM$DISR = Variant1, x = 1799, y = 1799}, {RUST$ENUM$DISR = Variant1, [...]}}
-// gdbr-check:$13 = method_on_enum::Enum::Variant1{x: 1799, y: 1799}
+// gdbr-check:$13 = Variant1 = {x = 1799, y = 1799}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/method-on-generic-struct.rs b/src/test/debuginfo/method-on-generic-struct.rs
index 20d419b4ac088..3e247b50bd139 100644
--- a/src/test/debuginfo/method-on-generic-struct.rs
+++ b/src/test/debuginfo/method-on-generic-struct.rs
@@ -19,7 +19,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {x = {__0 = 8888, __1 = -8888}}
-// gdbr-check:$1 = method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdbr-check:$1 = Struct<(u32, i32)> = {x = {8888, -8888}}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -29,7 +29,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {x = {__0 = 8888, __1 = -8888}}
-// gdbr-check:$4 = method_on_generic_struct::Struct<(u32, i32)> {x: (8888, -8888)}
+// gdbr-check:$4 = Struct<(u32, i32)> = {x = {8888, -8888}}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -39,7 +39,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {x = 1234.5}
-// gdbr-check:$7 = method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdbr-check:$7 = Struct<f64> = {x = 1234.5}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -49,7 +49,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {x = 1234.5}
-// gdbr-check:$10 = method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdbr-check:$10 = Struct<f64> = {x = 1234.5}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -59,7 +59,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {x = 1234.5}
-// gdbr-check:$13 = method_on_generic_struct::Struct<f64> {x: 1234.5}
+// gdbr-check:$13 = Struct<f64> = {x = 1234.5}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/method-on-struct.rs b/src/test/debuginfo/method-on-struct.rs
index c7546fe2221ff..236443c2ac9ab 100644
--- a/src/test/debuginfo/method-on-struct.rs
+++ b/src/test/debuginfo/method-on-struct.rs
@@ -19,7 +19,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {x = 100}
-// gdbr-check:$1 = method_on_struct::Struct {x: 100}
+// gdbr-check:$1 = Struct = {x = 100}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -29,7 +29,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {x = 100}
-// gdbr-check:$4 = method_on_struct::Struct {x: 100}
+// gdbr-check:$4 = Struct = {x = 100}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -39,7 +39,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {x = 200}
-// gdbr-check:$7 = method_on_struct::Struct {x: 200}
+// gdbr-check:$7 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -49,7 +49,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {x = 200}
-// gdbr-check:$10 = method_on_struct::Struct {x: 200}
+// gdbr-check:$10 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -59,7 +59,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {x = 200}
-// gdbr-check:$13 = method_on_struct::Struct {x: 200}
+// gdbr-check:$13 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/method-on-trait.rs b/src/test/debuginfo/method-on-trait.rs
index 1dc37bb06ac40..89196d7028394 100644
--- a/src/test/debuginfo/method-on-trait.rs
+++ b/src/test/debuginfo/method-on-trait.rs
@@ -19,7 +19,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {x = 100}
-// gdbr-check:$1 = method_on_trait::Struct {x: 100}
+// gdbr-check:$1 = Struct = {x = 100}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -29,7 +29,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {x = 100}
-// gdbr-check:$4 = method_on_trait::Struct {x: 100}
+// gdbr-check:$4 = Struct = {x = 100}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -39,7 +39,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {x = 200}
-// gdbr-check:$7 = method_on_trait::Struct {x: 200}
+// gdbr-check:$7 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -49,7 +49,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {x = 200}
-// gdbr-check:$10 = method_on_trait::Struct {x: 200}
+// gdbr-check:$10 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -59,7 +59,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {x = 200}
-// gdbr-check:$13 = method_on_trait::Struct {x: 200}
+// gdbr-check:$13 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/method-on-tuple-struct.rs b/src/test/debuginfo/method-on-tuple-struct.rs
index dac762ae0c35b..9257e6deed514 100644
--- a/src/test/debuginfo/method-on-tuple-struct.rs
+++ b/src/test/debuginfo/method-on-tuple-struct.rs
@@ -19,7 +19,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {__0 = 100, __1 = -100.5}
-// gdbr-check:$1 = method_on_tuple_struct::TupleStruct (100, -100.5)
+// gdbr-check:$1 = TupleStruct = {100, -100.5}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -29,7 +29,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {__0 = 100, __1 = -100.5}
-// gdbr-check:$4 = method_on_tuple_struct::TupleStruct (100, -100.5)
+// gdbr-check:$4 = TupleStruct = {100, -100.5}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -39,7 +39,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {__0 = 200, __1 = -200.5}
-// gdbr-check:$7 = method_on_tuple_struct::TupleStruct (200, -200.5)
+// gdbr-check:$7 = TupleStruct = {200, -200.5}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -49,7 +49,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {__0 = 200, __1 = -200.5}
-// gdbr-check:$10 = method_on_tuple_struct::TupleStruct (200, -200.5)
+// gdbr-check:$10 = TupleStruct = {200, -200.5}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -59,7 +59,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {__0 = 200, __1 = -200.5}
-// gdbr-check:$13 = method_on_tuple_struct::TupleStruct (200, -200.5)
+// gdbr-check:$13 = TupleStruct = {200, -200.5}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/nil-enum.rs b/src/test/debuginfo/nil-enum.rs
index 94377421c0b0c..c566b0fa10aa2 100644
--- a/src/test/debuginfo/nil-enum.rs
+++ b/src/test/debuginfo/nil-enum.rs
@@ -17,11 +17,11 @@
 
 // gdb-command:print first
 // gdbg-check:$1 = {<No data fields>}
-// gdbr-check:$1 = <error reading variable>
+// gdbr-check:$1 = ANilEnum
 
 // gdb-command:print second
 // gdbg-check:$2 = {<No data fields>}
-// gdbr-check:$2 = <error reading variable>
+// gdbr-check:$2 = AnotherNilEnum
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/src/test/debuginfo/option-like-enum.rs b/src/test/debuginfo/option-like-enum.rs
index 39e6a4e4facf9..d9deea6aee3bc 100644
--- a/src/test/debuginfo/option-like-enum.rs
+++ b/src/test/debuginfo/option-like-enum.rs
@@ -19,15 +19,15 @@
 
 // gdb-command:print some
 // gdbg-check:$1 = {RUST$ENCODED$ENUM$0$None = {__0 = 0x12345678}}
-// gdbr-check:$1 = core::option::Option<&u32>::Some(0x12345678)
+// gdbr-check:$1 = Some = {0x12345678}
 
 // gdb-command:print none
 // gdbg-check:$2 = {RUST$ENCODED$ENUM$0$None = {__0 = 0x0}}
-// gdbr-check:$2 = core::option::Option<&u32>::None
+// gdbr-check:$2 = None
 
 // gdb-command:print full
 // gdbg-check:$3 = {RUST$ENCODED$ENUM$1$Empty = {__0 = 454545, __1 = 0x87654321, __2 = 9988}}
-// gdbr-check:$3 = option_like_enum::MoreFields::Full(454545, 0x87654321, 9988)
+// gdbr-check:$3 = Full = {454545, 0x87654321, 9988}
 
 // gdbg-command:print empty_gdb->discr
 // gdbr-command:print empty_gdb.discr
@@ -35,7 +35,7 @@
 
 // gdb-command:print droid
 // gdbg-check:$5 = {RUST$ENCODED$ENUM$2$Void = {id = 675675, range = 10000001, internals = 0x43218765}}
-// gdbr-check:$5 = option_like_enum::NamedFields::Droid{id: 675675, range: 10000001, internals: 0x43218765}
+// gdbr-check:$5 = Droid = {id = 675675, range = 10000001, internals = 0x43218765}
 
 // gdbg-command:print void_droid_gdb->internals
 // gdbr-command:print void_droid_gdb.internals
@@ -43,7 +43,7 @@
 
 // gdb-command:print nested_non_zero_yep
 // gdbg-check:$7 = {RUST$ENCODED$ENUM$1$2$Nope = {__0 = 10.5, __1 = {a = 10, b = 20, c = [...]}}}
-// gdbr-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, option_like_enum::NestedNonZeroField {a: 10, b: 20, c: 0x[...] "x[...]"})
+// gdbr-check:$7 = option_like_enum::NestedNonZero::Yep(10.5, NestedNonZeroField = {a = 10, b = 20, c = 0x3fffffffe6cc "x000000000"})
 
 // gdb-command:print nested_non_zero_nope
 // gdbg-check:$8 = {RUST$ENCODED$ENUM$1$2$Nope = {__0 = [...], __1 = {a = [...], b = [...], c = 0x0}}}
diff --git a/src/test/debuginfo/packed-struct-with-destructor.rs b/src/test/debuginfo/packed-struct-with-destructor.rs
index 50bd857d46076..df309494a1978 100644
--- a/src/test/debuginfo/packed-struct-with-destructor.rs
+++ b/src/test/debuginfo/packed-struct-with-destructor.rs
@@ -19,36 +19,36 @@
 
 // gdb-command:print packed
 // gdbg-check:$1 = {x = 123, y = 234, z = 345}
-// gdbr-check:$1 = packed_struct_with_destructor::Packed {x: 123, y: 234, z: 345}
+// gdbr-check:$1 = Packed = {x = 123, y = 234, z = 345}
 
 // gdb-command:print packedInPacked
 // gdbg-check:$2 = {a = 1111, b = {x = 2222, y = 3333, z = 4444}, c = 5555, d = {x = 6666, y = 7777, z = 8888}}
-// 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}}
+// gdbr-check:$2 = PackedInPacked = {a = 1111, b = Packed = {x = 2222, y = 3333, z = 4444}, c = 5555, d = Packed = {x = 6666, y = 7777, z = 8888}}
 
 // gdb-command:print packedInUnpacked
 // gdbg-check:$3 = {a = -1111, b = {x = -2222, y = -3333, z = -4444}, c = -5555, d = {x = -6666, y = -7777, z = -8888}}
-// 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}}
+// gdbr-check:$3 = PackedInUnpacked = {a = -1111, b = Packed = {x = -2222, y = -3333, z = -4444}, c = -5555, d = Packed = {x = -6666, y = -7777, z = -8888}}
 
 // gdb-command:print unpackedInPacked
 // gdbg-check:$4 = {a = 987, b = {x = 876, y = 765, z = 654}, c = {x = 543, y = 432, z = 321}, d = 210}
-// 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}
+// gdbr-check:$4 = UnpackedInPacked = {a = 987, b = Unpacked = {x = 876, y = 765, z = 654}, c = Unpacked = {x = 543, y = 432, z = 321}, d = 210}
 
 
 // gdb-command:print packedInPackedWithDrop
 // gdbg-check:$5 = {a = 11, b = {x = 22, y = 33, z = 44}, c = 55, d = {x = 66, y = 77, z = 88}}
-// 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}}
+// gdbr-check:$5 = PackedInPackedWithDrop = {a = 11, b = Packed = {x = 22, y = 33, z = 44}, c = 55, d = Packed = {x = 66, y = 77, z = 88}}
 
 // gdb-command:print packedInUnpackedWithDrop
 // gdbg-check:$6 = {a = -11, b = {x = -22, y = -33, z = -44}, c = -55, d = {x = -66, y = -77, z = -88}}
-// 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}}
+// gdbr-check:$6 = PackedInUnpackedWithDrop = {a = -11, b = Packed = {x = -22, y = -33, z = -44}, c = -55, d = Packed = {x = -66, y = -77, z = -88}}
 
 // gdb-command:print unpackedInPackedWithDrop
 // gdbg-check:$7 = {a = 98, b = {x = 87, y = 76, z = 65}, c = {x = 54, y = 43, z = 32}, d = 21}
-// 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}
+// gdbr-check:$7 = UnpackedInPackedWithDrop = {a = 98, b = Unpacked = {x = 87, y = 76, z = 65}, c = Unpacked = {x = 54, y = 43, z = 32}, d = 21}
 
 // gdb-command:print deeplyNested
 // gdbg-check:$8 = {a = {a = 1, b = {x = 2, y = 3, z = 4}, c = 5, d = {x = 6, y = 7, z = 8}}, b = {a = 9, b = {x = 10, y = 11, z = 12}, c = {x = 13, y = 14, z = 15}, d = 16}, c = {a = 17, b = {x = 18, y = 19, z = 20}, c = 21, d = {x = 22, y = 23, z = 24}}, d = {a = 25, b = {x = 26, y = 27, z = 28}, c = 29, d = {x = 30, y = 31, z = 32}}, e = {a = 33, b = {x = 34, y = 35, z = 36}, c = {x = 37, y = 38, z = 39}, d = 40}, f = {a = 41, b = {x = 42, y = 43, z = 44}, c = 45, d = {x = 46, y = 47, z = 48}}}
-// 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}}}
+// gdbr-check:$8 = DeeplyNested = {a = PackedInPacked = {a = 1, b = Packed = {x = 2, y = 3, z = 4}, c = 5, d = Packed = {x = 6, y = 7, z = 8}}, b = UnpackedInPackedWithDrop = {a = 9, b = Unpacked = {x = 10, y = 11, z = 12}, c = Unpacked = {x = 13, y = 14, z = 15}, d = 16}, c = PackedInUnpacked = {a = 17, b = Packed = {x = 18, y = 19, z = 20}, c = 21, d = Packed = {x = 22, y = 23, z = 24}}, d = PackedInUnpackedWithDrop = {a = 25, b = Packed = {x = 26, y = 27, z = 28}, c = 29, d = Packed = {x = 30, y = 31, z = 32}}, e = UnpackedInPacked = {a = 33, b = Unpacked = {x = 34, y = 35, z = 36}, c = Unpacked = {x = 37, y = 38, z = 39}, d = 40}, f = PackedInPackedWithDrop = {a = 41, b = Packed = {x = 42, y = 43, z = 44}, c = 45, d = Packed = {x = 46, y = 47, z = 48}}}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/packed-struct.rs b/src/test/debuginfo/packed-struct.rs
index 16e6371a9c0a9..e82ea28b57f98 100644
--- a/src/test/debuginfo/packed-struct.rs
+++ b/src/test/debuginfo/packed-struct.rs
@@ -20,19 +20,19 @@
 
 // gdb-command:print packed
 // gdbg-check:$1 = {x = 123, y = 234, z = 345}
-// gdbr-check:$1 = packed_struct::Packed {x: 123, y: 234, z: 345}
+// gdbr-check:$1 = Packed = {x = 123, y = 234, z = 345}
 
 // gdb-command:print packedInPacked
 // gdbg-check:$2 = {a = 1111, b = {x = 2222, y = 3333, z = 4444}, c = 5555, d = {x = 6666, y = 7777, z = 8888}}
-// 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}}
+// gdbr-check:$2 = PackedInPacked = {a = 1111, b = Packed = {x = 2222, y = 3333, z = 4444}, c = 5555, d = Packed = {x = 6666, y = 7777, z = 8888}}
 
 // gdb-command:print packedInUnpacked
 // gdbg-check:$3 = {a = -1111, b = {x = -2222, y = -3333, z = -4444}, c = -5555, d = {x = -6666, y = -7777, z = -8888}}
-// 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}}
+// gdbr-check:$3 = PackedInUnpacked = {a = -1111, b = Packed = {x = -2222, y = -3333, z = -4444}, c = -5555, d = Packed = {x = -6666, y = -7777, z = -8888}}
 
 // gdb-command:print unpackedInPacked
 // gdbg-check:$4 = {a = 987, b = {x = 876, y = 765, z = 654, w = 543}, c = {x = 432, y = 321, z = 210, w = 109}, d = -98}
-// 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}
+// gdbr-check:$4 = UnpackedInPacked = {a = 987, b = Unpacked = {x = 876, y = 765, z = 654, w = 543}, c = Unpacked = {x = 432, y = 321, z = 210, w = 109}, d = -98}
 
 // gdb-command:print sizeof(packed)
 // gdb-check:$5 = 14
diff --git a/src/test/debuginfo/self-in-default-method.rs b/src/test/debuginfo/self-in-default-method.rs
index 796d122cd66ba..b3e277bfdcbba 100644
--- a/src/test/debuginfo/self-in-default-method.rs
+++ b/src/test/debuginfo/self-in-default-method.rs
@@ -19,7 +19,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {x = 100}
-// gdbr-check:$1 = self_in_default_method::Struct {x: 100}
+// gdbr-check:$1 = Struct = {x = 100}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -29,7 +29,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {x = 100}
-// gdbr-check:$4 = self_in_default_method::Struct {x: 100}
+// gdbr-check:$4 = Struct = {x = 100}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -39,7 +39,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {x = 200}
-// gdbr-check:$7 = self_in_default_method::Struct {x: 200}
+// gdbr-check:$7 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -49,7 +49,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {x = 200}
-// gdbr-check:$10 = self_in_default_method::Struct {x: 200}
+// gdbr-check:$10 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -59,7 +59,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {x = 200}
-// gdbr-check:$13 = self_in_default_method::Struct {x: 200}
+// gdbr-check:$13 = Struct = {x = 200}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/self-in-generic-default-method.rs b/src/test/debuginfo/self-in-generic-default-method.rs
index b07d7ca5fb7b7..e1e2e8c2b97ac 100644
--- a/src/test/debuginfo/self-in-generic-default-method.rs
+++ b/src/test/debuginfo/self-in-generic-default-method.rs
@@ -19,7 +19,7 @@
 // STACK BY REF
 // gdb-command:print *self
 // gdbg-check:$1 = {x = 987}
-// gdbr-check:$1 = self_in_generic_default_method::Struct {x: 987}
+// gdbr-check:$1 = Struct = {x = 987}
 // gdb-command:print arg1
 // gdb-check:$2 = -1
 // gdb-command:print arg2
@@ -29,7 +29,7 @@
 // STACK BY VAL
 // gdb-command:print self
 // gdbg-check:$4 = {x = 987}
-// gdbr-check:$4 = self_in_generic_default_method::Struct {x: 987}
+// gdbr-check:$4 = Struct = {x = 987}
 // gdb-command:print arg1
 // gdb-check:$5 = -3
 // gdb-command:print arg2
@@ -39,7 +39,7 @@
 // OWNED BY REF
 // gdb-command:print *self
 // gdbg-check:$7 = {x = 879}
-// gdbr-check:$7 = self_in_generic_default_method::Struct {x: 879}
+// gdbr-check:$7 = Struct = {x = 879}
 // gdb-command:print arg1
 // gdb-check:$8 = -5
 // gdb-command:print arg2
@@ -49,7 +49,7 @@
 // OWNED BY VAL
 // gdb-command:print self
 // gdbg-check:$10 = {x = 879}
-// gdbr-check:$10 = self_in_generic_default_method::Struct {x: 879}
+// gdbr-check:$10 = Struct = {x = 879}
 // gdb-command:print arg1
 // gdb-check:$11 = -7
 // gdb-command:print arg2
@@ -59,7 +59,7 @@
 // OWNED MOVED
 // gdb-command:print *self
 // gdbg-check:$13 = {x = 879}
-// gdbr-check:$13 = self_in_generic_default_method::Struct {x: 879}
+// gdbr-check:$13 = Struct = {x = 879}
 // gdb-command:print arg1
 // gdb-check:$14 = -9
 // gdb-command:print arg2
diff --git a/src/test/debuginfo/simd.rs b/src/test/debuginfo/simd.rs
index 75e68f7efedef..e3ecffd67d470 100644
--- a/src/test/debuginfo/simd.rs
+++ b/src/test/debuginfo/simd.rs
@@ -23,43 +23,43 @@
 // gdbg-command:print/d vi8x16
 // gdbr-command:print vi8x16
 // gdbg-check:$1 = {__0 = 0, __1 = 1, __2 = 2, __3 = 3, __4 = 4, __5 = 5, __6 = 6, __7 = 7, __8 = 8, __9 = 9, __10 = 10, __11 = 11, __12 = 12, __13 = 13, __14 = 14, __15 = 15}
-// gdbr-check:$1 = simd::i8x16 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)
+// gdbr-check:$1 = i8x16 = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
 // gdbg-command:print/d vi16x8
 // gdbr-command:print vi16x8
 // gdbg-check:$2 = {__0 = 16, __1 = 17, __2 = 18, __3 = 19, __4 = 20, __5 = 21, __6 = 22, __7 = 23}
-// gdbr-check:$2 = simd::i16x8 (16, 17, 18, 19, 20, 21, 22, 23)
+// gdbr-check:$2 = i16x8 = {16, 17, 18, 19, 20, 21, 22, 23}
 // gdbg-command:print/d vi32x4
 // gdbr-command:print vi32x4
 // gdbg-check:$3 = {__0 = 24, __1 = 25, __2 = 26, __3 = 27}
-// gdbr-check:$3 = simd::i32x4 (24, 25, 26, 27)
+// gdbr-check:$3 = i32x4 = {24, 25, 26, 27}
 // gdbg-command:print/d vi64x2
 // gdbr-command:print vi64x2
 // gdbg-check:$4 = {__0 = 28, __1 = 29}
-// gdbr-check:$4 = simd::i64x2 (28, 29)
+// gdbr-check:$4 = i64x2 = {28, 29}
 
 // gdbg-command:print/d vu8x16
 // gdbr-command:print vu8x16
 // gdbg-check:$5 = {__0 = 30, __1 = 31, __2 = 32, __3 = 33, __4 = 34, __5 = 35, __6 = 36, __7 = 37, __8 = 38, __9 = 39, __10 = 40, __11 = 41, __12 = 42, __13 = 43, __14 = 44, __15 = 45}
-// gdbr-check:$5 = simd::u8x16 (30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45)
+// gdbr-check:$5 = u8x16 = {30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45}
 // gdbg-command:print/d vu16x8
 // gdbr-command:print vu16x8
 // gdbg-check:$6 = {__0 = 46, __1 = 47, __2 = 48, __3 = 49, __4 = 50, __5 = 51, __6 = 52, __7 = 53}
-// gdbr-check:$6 = simd::u16x8 (46, 47, 48, 49, 50, 51, 52, 53)
+// gdbr-check:$6 = u16x8 = {46, 47, 48, 49, 50, 51, 52, 53}
 // gdbg-command:print/d vu32x4
 // gdbr-command:print vu32x4
 // gdbg-check:$7 = {__0 = 54, __1 = 55, __2 = 56, __3 = 57}
-// gdbr-check:$7 = simd::u32x4 (54, 55, 56, 57)
+// gdbr-check:$7 = u32x4 = {54, 55, 56, 57}
 // gdbg-command:print/d vu64x2
 // gdbr-command:print vu64x2
 // gdbg-check:$8 = {__0 = 58, __1 = 59}
-// gdbr-check:$8 = simd::u64x2 (58, 59)
+// gdbr-check:$8 = u64x2 = {58, 59}
 
 // gdb-command:print vf32x4
 // gdbg-check:$9 = {__0 = 60.5, __1 = 61.5, __2 = 62.5, __3 = 63.5}
-// gdbr-check:$9 = simd::f32x4 (60.5, 61.5, 62.5, 63.5)
+// gdbr-check:$9 = f32x4 = {60.5, 61.5, 62.5, 63.5}
 // gdb-command:print vf64x2
 // gdbg-check:$10 = {__0 = 64.5, __1 = 65.5}
-// gdbr-check:$10 = simd::f64x2 (64.5, 65.5)
+// gdbr-check:$10 = f64x2 = {64.5, 65.5}
 
 // gdb-command:continue
 
diff --git a/src/test/debuginfo/simple-struct.rs b/src/test/debuginfo/simple-struct.rs
index 4956313ad2214..3cf9f041a9b30 100644
--- a/src/test/debuginfo/simple-struct.rs
+++ b/src/test/debuginfo/simple-struct.rs
@@ -51,57 +51,57 @@
 
 // gdb-command:print no_padding16
 // gdbg-check:$7 = {x = 10000, y = -10001}
-// gdbr-check:$7 = simple_struct::NoPadding16 {x: 10000, y: -10001}
+// gdbr-check:$7 = NoPadding16 = {x = 10000, y = -10001}
 
 // gdb-command:print no_padding32
 // gdbg-check:$8 = {x = -10002, y = -10003.5, z = 10004}
-// gdbr-check:$8 = simple_struct::NoPadding32 {x: -10002, y: -10003.5, z: 10004}
+// gdbr-check:$8 = NoPadding32 = {x = -10002, y = -10003.5, z = 10004}
 
 // gdb-command:print no_padding64
 // gdbg-check:$9 = {x = -10005.5, y = 10006, z = 10007}
-// gdbr-check:$9 = simple_struct::NoPadding64 {x: -10005.5, y: 10006, z: 10007}
+// gdbr-check:$9 = NoPadding64 = {x = -10005.5, y = 10006, z = 10007}
 
 // gdb-command:print no_padding163264
 // gdbg-check:$10 = {a = -10008, b = 10009, c = 10010, d = 10011}
-// gdbr-check:$10 = simple_struct::NoPadding163264 {a: -10008, b: 10009, c: 10010, d: 10011}
+// gdbr-check:$10 = NoPadding163264 = {a = -10008, b = 10009, c = 10010, d = 10011}
 
 // gdb-command:print internal_padding
 // gdbg-check:$11 = {x = 10012, y = -10013}
-// gdbr-check:$11 = simple_struct::InternalPadding {x: 10012, y: -10013}
+// gdbr-check:$11 = InternalPadding = {x = 10012, y = -10013}
 
 // gdb-command:print padding_at_end
 // gdbg-check:$12 = {x = -10014, y = 10015}
-// gdbr-check:$12 = simple_struct::PaddingAtEnd {x: -10014, y: 10015}
+// gdbr-check:$12 = PaddingAtEnd = {x = -10014, y = 10015}
 
 // gdbg-command:print 'simple_struct::NO_PADDING_16'
 // gdbr-command:print simple_struct::NO_PADDING_16
 // gdbg-check:$13 = {x = 100, y = -101}
-// gdbr-check:$13 = simple_struct::NoPadding16 {x: 100, y: -101}
+// gdbr-check:$13 = NoPadding16 = {x = 100, y = -101}
 
 // gdbg-command:print 'simple_struct::NO_PADDING_32'
 // gdbr-command:print simple_struct::NO_PADDING_32
 // gdbg-check:$14 = {x = -15, y = -16, z = 17}
-// gdbr-check:$14 = simple_struct::NoPadding32 {x: -15, y: -16, z: 17}
+// gdbr-check:$14 = NoPadding32 = {x = -15, y = -16, z = 17}
 
 // gdbg-command:print 'simple_struct::NO_PADDING_64'
 // gdbr-command:print simple_struct::NO_PADDING_64
 // gdbg-check:$15 = {x = -18, y = 19, z = 20}
-// gdbr-check:$15 = simple_struct::NoPadding64 {x: -18, y: 19, z: 20}
+// gdbr-check:$15 = NoPadding64 = {x = -18, y = 19, z = 20}
 
 // gdbg-command:print 'simple_struct::NO_PADDING_163264'
 // gdbr-command:print simple_struct::NO_PADDING_163264
 // gdbg-check:$16 = {a = -21, b = 22, c = 23, d = 24}
-// gdbr-check:$16 = simple_struct::NoPadding163264 {a: -21, b: 22, c: 23, d: 24}
+// gdbr-check:$16 = NoPadding163264 = {a = -21, b = 22, c = 23, d = 24}
 
 // gdbg-command:print 'simple_struct::INTERNAL_PADDING'
 // gdbr-command:print simple_struct::INTERNAL_PADDING
 // gdbg-check:$17 = {x = 25, y = -26}
-// gdbr-check:$17 = simple_struct::InternalPadding {x: 25, y: -26}
+// gdbr-check:$17 = InternalPadding = {x = 25, y = -26}
 
 // gdbg-command:print 'simple_struct::PADDING_AT_END'
 // gdbr-command:print simple_struct::PADDING_AT_END
 // gdbg-check:$18 = {x = -27, y = 28}
-// gdbr-check:$18 = simple_struct::PaddingAtEnd {x: -27, y: 28}
+// gdbr-check:$18 = PaddingAtEnd = {x = -27, y = 28}
 
 // gdb-command:continue
 
diff --git a/src/test/debuginfo/simple-tuple.rs b/src/test/debuginfo/simple-tuple.rs
index 354a2c26cb36d..00bff45c741d7 100644
--- a/src/test/debuginfo/simple-tuple.rs
+++ b/src/test/debuginfo/simple-tuple.rs
@@ -53,58 +53,58 @@
 // gdbg-command:print/d noPadding8
 // gdbr-command:print noPadding8
 // gdbg-check:$8 = {__0 = -100, __1 = 100}
-// gdbr-check:$8 = (-100, 100)
+// gdbr-check:$8 = {-100, 100}
 // gdb-command:print noPadding16
 // gdbg-check:$9 = {__0 = 0, __1 = 1, __2 = 2}
-// gdbr-check:$9 = (0, 1, 2)
+// gdbr-check:$9 = {0, 1, 2}
 // gdb-command:print noPadding32
 // gdbg-check:$10 = {__0 = 3, __1 = 4.5, __2 = 5}
-// gdbr-check:$10 = (3, 4.5, 5)
+// gdbr-check:$10 = {3, 4.5, 5}
 // gdb-command:print noPadding64
 // gdbg-check:$11 = {__0 = 6, __1 = 7.5, __2 = 8}
-// gdbr-check:$11 = (6, 7.5, 8)
+// gdbr-check:$11 = {6, 7.5, 8}
 
 // gdb-command:print internalPadding1
 // gdbg-check:$12 = {__0 = 9, __1 = 10}
-// gdbr-check:$12 = (9, 10)
+// gdbr-check:$12 = {9, 10}
 // gdb-command:print internalPadding2
 // gdbg-check:$13 = {__0 = 11, __1 = 12, __2 = 13, __3 = 14}
-// gdbr-check:$13 = (11, 12, 13, 14)
+// gdbr-check:$13 = {11, 12, 13, 14}
 
 // gdb-command:print paddingAtEnd
 // gdbg-check:$14 = {__0 = 15, __1 = 16}
-// gdbr-check:$14 = (15, 16)
+// gdbr-check:$14 = {15, 16}
 
 // gdbg-command:print/d 'simple_tuple::NO_PADDING_8'
 // gdbr-command:print simple_tuple::NO_PADDING_8
 // gdbg-check:$15 = {__0 = -127, __1 = 127}
-// gdbr-check:$15 = (-127, 127)
+// gdbr-check:$15 = {-127, 127}
 // gdbg-command:print 'simple_tuple::NO_PADDING_16'
 // gdbr-command:print simple_tuple::NO_PADDING_16
 // gdbg-check:$16 = {__0 = -10, __1 = 10, __2 = 9}
-// gdbr-check:$16 = (-10, 10, 9)
+// gdbr-check:$16 = {-10, 10, 9}
 // gdbg-command:print 'simple_tuple::NO_PADDING_32'
 // gdbr-command:print simple_tuple::NO_PADDING_32
 // gdbg-check:$17 = {__0 = 14, __1 = 15, __2 = 16}
-// gdbr-check:$17 = (14, 15, 16)
+// gdbr-check:$17 = {14, 15, 16}
 // gdbg-command:print 'simple_tuple::NO_PADDING_64'
 // gdbr-command:print simple_tuple::NO_PADDING_64
 // gdbg-check:$18 = {__0 = 17, __1 = 18, __2 = 19}
-// gdbr-check:$18 = (17, 18, 19)
+// gdbr-check:$18 = {17, 18, 19}
 
 // gdbg-command:print 'simple_tuple::INTERNAL_PADDING_1'
 // gdbr-command:print simple_tuple::INTERNAL_PADDING_1
 // gdbg-check:$19 = {__0 = 110, __1 = 111}
-// gdbr-check:$19 = (110, 111)
+// gdbr-check:$19 = {110, 111}
 // gdbg-command:print 'simple_tuple::INTERNAL_PADDING_2'
 // gdbr-command:print simple_tuple::INTERNAL_PADDING_2
 // gdbg-check:$20 = {__0 = 112, __1 = 113, __2 = 114, __3 = 115}
-// gdbr-check:$20 = (112, 113, 114, 115)
+// gdbr-check:$20 = {112, 113, 114, 115}
 
 // gdbg-command:print 'simple_tuple::PADDING_AT_END'
 // gdbr-command:print simple_tuple::PADDING_AT_END
 // gdbg-check:$21 = {__0 = 116, __1 = 117}
-// gdbr-check:$21 = (116, 117)
+// gdbr-check:$21 = {116, 117}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/struct-in-enum.rs b/src/test/debuginfo/struct-in-enum.rs
index bd044188dbcbc..d64962fdf7615 100644
--- a/src/test/debuginfo/struct-in-enum.rs
+++ b/src/test/debuginfo/struct-in-enum.rs
@@ -21,15 +21,15 @@
 
 // gdb-command:print case1
 // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, __0 = 0, __1 = {x = 2088533116, y = 2088533116, z = 31868}}, {RUST$ENUM$DISR = Case1, [...]}}
-// gdbr-check:$1 = struct_in_enum::Regular::Case1(0, struct_in_enum::Struct {x: 2088533116, y: 2088533116, z: 31868})
+// gdbr-check:$1 = Case1 = {0, Struct = {x = 2088533116, y = 2088533116, z = 31868}}
 
 // gdb-command:print case2
 // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, __0 = 0, __1 = 1229782938247303441, __2 = 4369}}
-// gdbr-check:$2 = struct_in_enum::Regular::Case2(0, 1229782938247303441, 4369)
+// gdbr-check:$2 = Case2 = {0, 1229782938247303441, 4369}
 
 // gdb-command:print univariant
 // gdbg-check:$3 = {{__0 = {x = 123, y = 456, z = 789}}}
-// gdbr-check:$3 = struct_in_enum::Univariant::TheOnlyCase(struct_in_enum::Struct {x: 123, y: 456, z: 789})
+// gdbr-check:$3 = TheOnlyCase = {Struct = {x = 123, y = 456, z = 789}}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/struct-in-struct.rs b/src/test/debuginfo/struct-in-struct.rs
index 46524cf1d029a..360676b775f33 100644
--- a/src/test/debuginfo/struct-in-struct.rs
+++ b/src/test/debuginfo/struct-in-struct.rs
@@ -19,15 +19,15 @@
 
 // gdb-command:print three_simple_structs
 // gdbg-check:$1 = {x = {x = 1}, y = {x = 2}, z = {x = 3}}
-// 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}}
+// gdbr-check:$1 = ThreeSimpleStructs = {x = Simple = {x = 1}, y = Simple = {x = 2}, z = Simple = {x = 3}}
 
 // gdb-command:print internal_padding_parent
 // gdbg-check:$2 = {x = {x = 4, y = 5}, y = {x = 6, y = 7}, z = {x = 8, y = 9}}
-// 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}}
+// gdbr-check:$2 = InternalPaddingParent = {x = InternalPadding = {x = 4, y = 5}, y = InternalPadding = {x = 6, y = 7}, z = InternalPadding = {x = 8, y = 9}}
 
 // gdb-command:print padding_at_end_parent
 // gdbg-check:$3 = {x = {x = 10, y = 11}, y = {x = 12, y = 13}, z = {x = 14, y = 15}}
-// 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}}
+// gdbr-check:$3 = PaddingAtEndParent = {x = PaddingAtEnd = {x = 10, y = 11}, y = PaddingAtEnd = {x = 12, y = 13}, z = PaddingAtEnd = {x = 14, y = 15}}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/struct-style-enum.rs b/src/test/debuginfo/struct-style-enum.rs
index b156a3be699e3..eeef690f6cc5b 100644
--- a/src/test/debuginfo/struct-style-enum.rs
+++ b/src/test/debuginfo/struct-style-enum.rs
@@ -21,19 +21,19 @@
 
 // gdb-command:print case1
 // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, a = 0, b = 31868, c = 31868, d = 31868, e = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}}
-// gdbr-check:$1 = struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868}
+// gdbr-check:$1 = Case1 = {a = 0, b = 31868, c = 31868, d = 31868, e = 31868}
 
 // gdb-command:print case2
 // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, a = 0, b = 286331153, c = 286331153}, {RUST$ENUM$DISR = Case2, [...]}}
-// gdbr-check:$2 = struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153}
+// gdbr-check:$2 = Case2 = {a = 0, b = 286331153, c = 286331153}
 
 // gdb-command:print case3
 // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, a = 0, b = 6438275382588823897}}
-// gdbr-check:$3 = struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897}
+// gdbr-check:$3 = Case3 = {a = 0, b = 6438275382588823897}
 
 // gdb-command:print univariant
 // gdbg-check:$4 = {{a = -1}}
-// gdbr-check:$4 = struct_style_enum::Univariant::TheOnlyCase{a: -1}
+// gdbr-check:$4 = TheOnlyCase = {a = -1}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/struct-with-destructor.rs b/src/test/debuginfo/struct-with-destructor.rs
index af70b4a63fd27..bfd43228af0f2 100644
--- a/src/test/debuginfo/struct-with-destructor.rs
+++ b/src/test/debuginfo/struct-with-destructor.rs
@@ -19,19 +19,19 @@
 // gdb-command:run
 // gdb-command:print simple
 // gdbg-check:$1 = {x = 10, y = 20}
-// gdbr-check:$1 = struct_with_destructor::WithDestructor {x: 10, y: 20}
+// gdbr-check:$1 = WithDestructor = {x = 10, y = 20}
 
 // gdb-command:print noDestructor
 // gdbg-check:$2 = {a = {x = 10, y = 20}, guard = -1}
-// gdbr-check:$2 = struct_with_destructor::NoDestructorGuarded {a: struct_with_destructor::NoDestructor {x: 10, y: 20}, guard: -1}
+// gdbr-check:$2 = NoDestructorGuarded = {a = NoDestructor = {x = 10, y = 20}, guard = -1}
 
 // gdb-command:print withDestructor
 // gdbg-check:$3 = {a = {x = 10, y = 20}, guard = -1}
-// gdbr-check:$3 = struct_with_destructor::WithDestructorGuarded {a: struct_with_destructor::WithDestructor {x: 10, y: 20}, guard: -1}
+// gdbr-check:$3 = WithDestructorGuarded = {a = WithDestructor = {x = 10, y = 20}, guard = -1}
 
 // gdb-command:print nested
 // gdbg-check:$4 = {a = {a = {x = 7890, y = 9870}}}
-// gdbr-check:$4 = struct_with_destructor::NestedOuter {a: struct_with_destructor::NestedInner {a: struct_with_destructor::WithDestructor {x: 7890, y: 9870}}}
+// gdbr-check:$4 = NestedOuter = {a = NestedInner = {a = WithDestructor = {x = 7890, y = 9870}}}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/tuple-in-struct.rs b/src/test/debuginfo/tuple-in-struct.rs
index dae1f5da542f5..896bd47e388af 100644
--- a/src/test/debuginfo/tuple-in-struct.rs
+++ b/src/test/debuginfo/tuple-in-struct.rs
@@ -18,38 +18,38 @@
 
 // gdb-command:print no_padding1
 // gdbg-check:$1 = {x = {__0 = 0, __1 = 1}, y = 2, z = {__0 = 3, __1 = 4, __2 = 5}}
-// gdbr-check:$1 = tuple_in_struct::NoPadding1 {x: (0, 1), y: 2, z: (3, 4, 5)}
+// gdbr-check:$1 = NoPadding1 = {x = {0, 1}, y = 2, z = {3, 4, 5}}
 // gdb-command:print no_padding2
 // gdbg-check:$2 = {x = {__0 = 6, __1 = 7}, y = {__0 = {__0 = 8, __1 = 9}, __1 = 10}}
-// gdbr-check:$2 = tuple_in_struct::NoPadding2 {x: (6, 7), y: ((8, 9), 10)}
+// gdbr-check:$2 = NoPadding2 = {x = {6, 7}, y = {{8, 9}, 10}}
 
 // gdb-command:print tuple_internal_padding
 // gdbg-check:$3 = {x = {__0 = 11, __1 = 12}, y = {__0 = 13, __1 = 14}}
-// gdbr-check:$3 = tuple_in_struct::TupleInternalPadding {x: (11, 12), y: (13, 14)}
+// gdbr-check:$3 = TupleInternalPadding = {x = {11, 12}, y = {13, 14}}
 // gdb-command:print struct_internal_padding
 // gdbg-check:$4 = {x = {__0 = 15, __1 = 16}, y = {__0 = 17, __1 = 18}}
-// gdbr-check:$4 = tuple_in_struct::StructInternalPadding {x: (15, 16), y: (17, 18)}
+// gdbr-check:$4 = StructInternalPadding = {x = {15, 16}, y = {17, 18}}
 // gdb-command:print both_internally_padded
 // gdbg-check:$5 = {x = {__0 = 19, __1 = 20, __2 = 21}, y = {__0 = 22, __1 = 23}}
-// gdbr-check:$5 = tuple_in_struct::BothInternallyPadded {x: (19, 20, 21), y: (22, 23)}
+// gdbr-check:$5 = BothInternallyPadded = {x = {19, 20, 21}, y = {22, 23}}
 
 // gdb-command:print single_tuple
 // gdbg-check:$6 = {x = {__0 = 24, __1 = 25, __2 = 26}}
-// gdbr-check:$6 = tuple_in_struct::SingleTuple {x: (24, 25, 26)}
+// gdbr-check:$6 = SingleTuple = {x = {24, 25, 26}}
 
 // gdb-command:print tuple_padded_at_end
 // gdbg-check:$7 = {x = {__0 = 27, __1 = 28}, y = {__0 = 29, __1 = 30}}
-// gdbr-check:$7 = tuple_in_struct::TuplePaddedAtEnd {x: (27, 28), y: (29, 30)}
+// gdbr-check:$7 = TuplePaddedAtEnd = {x = {27, 28}, y = {29, 30}}
 // gdb-command:print struct_padded_at_end
 // gdbg-check:$8 = {x = {__0 = 31, __1 = 32}, y = {__0 = 33, __1 = 34}}
-// gdbr-check:$8 = tuple_in_struct::StructPaddedAtEnd {x: (31, 32), y: (33, 34)}
+// gdbr-check:$8 = StructPaddedAtEnd = {x = {31, 32}, y = {33, 34}}
 // gdb-command:print both_padded_at_end
 // gdbg-check:$9 = {x = {__0 = 35, __1 = 36, __2 = 37}, y = {__0 = 38, __1 = 39}}
-// gdbr-check:$9 = tuple_in_struct::BothPaddedAtEnd {x: (35, 36, 37), y: (38, 39)}
+// gdbr-check:$9 = BothPaddedAtEnd = {x = {35, 36, 37}, y = {38, 39}}
 
 // gdb-command:print mixed_padding
 // gdbg-check:$10 = {x = {__0 = {__0 = 40, __1 = 41, __2 = 42}, __1 = {__0 = 43, __1 = 44}}, y = {__0 = 45, __1 = 46, __2 = 47, __3 = 48}}
-// gdbr-check:$10 = tuple_in_struct::MixedPadding {x: ((40, 41, 42), (43, 44)), y: (45, 46, 47, 48)}
+// gdbr-check:$10 = MixedPadding = {x = {{40, 41, 42}, {43, 44}}, y = {45, 46, 47, 48}}
 
 #![allow(unused_variables)]
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/src/test/debuginfo/tuple-in-tuple.rs b/src/test/debuginfo/tuple-in-tuple.rs
index 4ebc740b9c0f7..c8be4a3908a2d 100644
--- a/src/test/debuginfo/tuple-in-tuple.rs
+++ b/src/test/debuginfo/tuple-in-tuple.rs
@@ -18,27 +18,27 @@
 
 // gdb-command:print no_padding1
 // gdbg-check:$1 = {__0 = {__0 = 0, __1 = 1}, __1 = 2, __2 = 3}
-// gdbr-check:$1 = ((0, 1), 2, 3)
+// gdbr-check:$1 = {{0, 1}, 2, 3}
 // gdb-command:print no_padding2
 // gdbg-check:$2 = {__0 = 4, __1 = {__0 = 5, __1 = 6}, __2 = 7}
-// gdbr-check:$2 = (4, (5, 6), 7)
+// gdbr-check:$2 = {4, {5, 6}, 7}
 // gdb-command:print no_padding3
 // gdbg-check:$3 = {__0 = 8, __1 = 9, __2 = {__0 = 10, __1 = 11}}
-// gdbr-check:$3 = (8, 9, (10, 11))
+// gdbr-check:$3 = {8, 9, {10, 11}}
 
 // gdb-command:print internal_padding1
 // gdbg-check:$4 = {__0 = 12, __1 = {__0 = 13, __1 = 14}}
-// gdbr-check:$4 = (12, (13, 14))
+// gdbr-check:$4 = {12, {13, 14}}
 // gdb-command:print internal_padding2
 // gdbg-check:$5 = {__0 = 15, __1 = {__0 = 16, __1 = 17}}
-// gdbr-check:$5 = (15, (16, 17))
+// gdbr-check:$5 = {15, {16, 17}}
 
 // gdb-command:print padding_at_end1
 // gdbg-check:$6 = {__0 = 18, __1 = {__0 = 19, __1 = 20}}
-// gdbr-check:$6 = (18, (19, 20))
+// gdbr-check:$6 = {18, {19, 20}}
 // gdb-command:print padding_at_end2
 // gdbg-check:$7 = {__0 = {__0 = 21, __1 = 22}, __1 = 23}
-// gdbr-check:$7 = ((21, 22), 23)
+// gdbr-check:$7 = {{21, 22}, 23}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/tuple-struct.rs b/src/test/debuginfo/tuple-struct.rs
index aa644d8419b54..7707e5ad4cd95 100644
--- a/src/test/debuginfo/tuple-struct.rs
+++ b/src/test/debuginfo/tuple-struct.rs
@@ -18,27 +18,27 @@
 
 // gdb-command:print no_padding16
 // gdbg-check:$1 = {__0 = 10000, __1 = -10001}
-// gdbr-check:$1 = tuple_struct::NoPadding16 (10000, -10001)
+// gdbr-check:$1 = NoPadding16 = {10000, -10001}
 
 // gdb-command:print no_padding32
 // gdbg-check:$2 = {__0 = -10002, __1 = -10003.5, __2 = 10004}
-// gdbr-check:$2 = tuple_struct::NoPadding32 (-10002, -10003.5, 10004)
+// gdbr-check:$2 = NoPadding32 = {-10002, -10003.5, 10004}
 
 // gdb-command:print no_padding64
 // gdbg-check:$3 = {__0 = -10005.5, __1 = 10006, __2 = 10007}
-// gdbr-check:$3 = tuple_struct::NoPadding64 (-10005.5, 10006, 10007)
+// gdbr-check:$3 = NoPadding64 = {-10005.5, 10006, 10007}
 
 // gdb-command:print no_padding163264
 // gdbg-check:$4 = {__0 = -10008, __1 = 10009, __2 = 10010, __3 = 10011}
-// gdbr-check:$4 = tuple_struct::NoPadding163264 (-10008, 10009, 10010, 10011)
+// gdbr-check:$4 = NoPadding163264 = {-10008, 10009, 10010, 10011}
 
 // gdb-command:print internal_padding
 // gdbg-check:$5 = {__0 = 10012, __1 = -10013}
-// gdbr-check:$5 = tuple_struct::InternalPadding (10012, -10013)
+// gdbr-check:$5 = InternalPadding = {10012, -10013}
 
 // gdb-command:print padding_at_end
 // gdbg-check:$6 = {__0 = -10014, __1 = 10015}
-// gdbr-check:$6 = tuple_struct::PaddingAtEnd (-10014, 10015)
+// gdbr-check:$6 = PaddingAtEnd = {-10014, 10015}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/tuple-style-enum.rs b/src/test/debuginfo/tuple-style-enum.rs
index f36153d1f5c5a..a2c893b75d537 100644
--- a/src/test/debuginfo/tuple-style-enum.rs
+++ b/src/test/debuginfo/tuple-style-enum.rs
@@ -21,19 +21,19 @@
 
 // gdb-command:print case1
 // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, __0 = 0, __1 = 31868, __2 = 31868, __3 = 31868, __4 = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}}
-// gdbr-check:$1 = tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868)
+// gdbr-check:$1 = Case1 = {0, 31868, 31868, 31868, 31868}
 
 // gdb-command:print case2
 // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, __0 = 0, __1 = 286331153, __2 = 286331153}, {RUST$ENUM$DISR = Case2, [...]}}
-// gdbr-check:$2 = tuple_style_enum::Regular::Case2(0, 286331153, 286331153)
+// gdbr-check:$2 = Case2 = {0, 286331153, 286331153}
 
 // gdb-command:print case3
 // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, __0 = 0, __1 = 6438275382588823897}}
-// gdbr-check:$3 = tuple_style_enum::Regular::Case3(0, 6438275382588823897)
+// gdbr-check:$3 = Case3 = {0, 6438275382588823897}
 
 // gdb-command:print univariant
 // gdbg-check:$4 = {{__0 = -1}}
-// gdbr-check:$4 = tuple_style_enum::Univariant::TheOnlyCase(-1)
+// gdbr-check:$4 = TheOnlyCase = {-1}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/union-smoke.rs b/src/test/debuginfo/union-smoke.rs
index 0b2544151fd32..18f2c8750ac43 100644
--- a/src/test/debuginfo/union-smoke.rs
+++ b/src/test/debuginfo/union-smoke.rs
@@ -18,10 +18,10 @@
 // gdb-command:run
 // gdb-command:print u
 // gdbg-check:$1 = {a = {__0 = 2 '\002', __1 = 2 '\002'}, b = 514}
-// gdbr-check:$1 = union_smoke::U {a: (2, 2), b: 514}
+// gdbr-check:$1 = <error reading variable>
 // gdb-command:print union_smoke::SU
 // gdbg-check:$2 = {a = {__0 = 1 '\001', __1 = 1 '\001'}, b = 257}
-// gdbr-check:$2 = union_smoke::U {a: (1, 1), b: 257}
+// gdbr-check:$2 = <error reading variable>
 
 // === LLDB TESTS ==================================================================================
 
diff --git a/src/test/debuginfo/unique-enum.rs b/src/test/debuginfo/unique-enum.rs
index 5a99de7779cff..ddd3facf7745d 100644
--- a/src/test/debuginfo/unique-enum.rs
+++ b/src/test/debuginfo/unique-enum.rs
@@ -20,15 +20,15 @@
 
 // gdb-command:print *the_a
 // gdbg-check:$1 = {{RUST$ENUM$DISR = TheA, x = 0, y = 8970181431921507452}, {RUST$ENUM$DISR = TheA, [...]}}
-// gdbr-check:$1 = unique_enum::ABC::TheA{x: 0, y: 8970181431921507452}
+// gdbr-check:$1 = TheA = {x = 0, y = 8970181431921507452}
 
 // gdb-command:print *the_b
 // gdbg-check:$2 = {{RUST$ENUM$DISR = TheB, [...]}, {RUST$ENUM$DISR = TheB, __0 = 0, __1 = 286331153, __2 = 286331153}}
-// gdbr-check:$2 = unique_enum::ABC::TheB(0, 286331153, 286331153)
+// gdbr-check:$2 = TheB = {0, 286331153, 286331153}
 
 // gdb-command:print *univariant
 // gdbg-check:$3 = {{__0 = 123234}}
-// gdbr-check:$3 = unique_enum::Univariant::TheOnlyCase(123234)
+// gdbr-check:$3 = TheOnlyCase = {123234}
 
 
 // === LLDB TESTS ==================================================================================
diff --git a/src/test/debuginfo/unsized.rs b/src/test/debuginfo/unsized.rs
index b0ce335a8d913..fd4537a5aeb28 100644
--- a/src/test/debuginfo/unsized.rs
+++ b/src/test/debuginfo/unsized.rs
@@ -16,11 +16,11 @@
 
 // gdb-command:print *a
 // gdbg-check:$1 = {value = [...] "abc"}
-// gdbr-check:$1 = unsized::Foo<[u8]> {value: [...]}
+// gdbr-check:$1 = Foo<[u8]> = {value = 0x3fffffffe718}
 
 // gdb-command:print *b
 // gdbg-check:$2 = {value = {value = [...] "abc"}}
-// gdbr-check:$2 = unsized::Foo<unsized::Foo<[u8]>> {value: unsized::Foo<[u8]> {value: [...]}}
+// gdbr-check:$2 = Foo<unsized::Foo<[u8]>> = {value = Foo<[u8]> = {value = 0x3fffffffe718}}
 
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/src/test/debuginfo/var-captured-in-nested-closure.rs b/src/test/debuginfo/var-captured-in-nested-closure.rs
index b9a1d73b6d869..87cb7c2f6f059 100644
--- a/src/test/debuginfo/var-captured-in-nested-closure.rs
+++ b/src/test/debuginfo/var-captured-in-nested-closure.rs
@@ -22,10 +22,10 @@
 // gdb-check:$2 = 2
 // gdb-command:print a_struct
 // gdbg-check:$3 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$3 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$3 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *struct_ref
 // gdbg-check:$4 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$4 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$4 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *owned
 // gdb-check:$5 = 6
 // gdb-command:print closure_local
@@ -38,10 +38,10 @@
 // gdb-check:$8 = 2
 // gdb-command:print a_struct
 // gdbg-check:$9 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$9 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$9 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *struct_ref
 // gdbg-check:$10 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$10 = var_captured_in_nested_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$10 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *owned
 // gdb-check:$11 = 6
 // gdb-command:print closure_local
diff --git a/src/test/debuginfo/var-captured-in-sendable-closure.rs b/src/test/debuginfo/var-captured-in-sendable-closure.rs
index 120bbdd7ba902..593de4caa0085 100644
--- a/src/test/debuginfo/var-captured-in-sendable-closure.rs
+++ b/src/test/debuginfo/var-captured-in-sendable-closure.rs
@@ -20,7 +20,7 @@
 // gdb-check:$1 = 1
 // gdb-command:print a_struct
 // gdbg-check:$2 = {a = -2, b = 3.5, c = 4}
-// gdbr-check:$2 = var_captured_in_sendable_closure::Struct {a: -2, b: 3.5, c: 4}
+// gdbr-check:$2 = Struct = {a = -2, b = 3.5, c = 4}
 // gdb-command:print *owned
 // gdb-check:$3 = 5
 // gdb-command:continue
diff --git a/src/test/debuginfo/var-captured-in-stack-closure.rs b/src/test/debuginfo/var-captured-in-stack-closure.rs
index c795a095b9769..c63ed490eb59d 100644
--- a/src/test/debuginfo/var-captured-in-stack-closure.rs
+++ b/src/test/debuginfo/var-captured-in-stack-closure.rs
@@ -22,10 +22,10 @@
 // gdb-check:$2 = 2
 // gdb-command:print a_struct
 // gdbg-check:$3 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$3 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$3 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *struct_ref
 // gdbg-check:$4 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$4 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$4 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *owned
 // gdb-check:$5 = 6
 
@@ -37,10 +37,10 @@
 // gdb-check:$7 = 2
 // gdb-command:print a_struct
 // gdbg-check:$8 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$8 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$8 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *struct_ref
 // gdbg-check:$9 = {a = -3, b = 4.5, c = 5}
-// gdbr-check:$9 = var_captured_in_stack_closure::Struct {a: -3, b: 4.5, c: 5}
+// gdbr-check:$9 = Struct = {a = -3, b = 4.5, c = 5}
 // gdb-command:print *owned
 // gdb-check:$10 = 6
 
diff --git a/src/test/debuginfo/vec-slices.rs b/src/test/debuginfo/vec-slices.rs
index d321df8431b88..1e1e1f3ea9e63 100644
--- a/src/test/debuginfo/vec-slices.rs
+++ b/src/test/debuginfo/vec-slices.rs
@@ -44,19 +44,19 @@
 // gdb-check:$8 = 2
 // gdb-command:print padded_tuple.data_ptr[0]
 // gdbg-check:$9 = {__0 = 6, __1 = 7}
-// gdbr-check:$9 = (6, 7)
+// gdbr-check:$9 = {6, 7}
 // gdb-command:print padded_tuple.data_ptr[1]
 // gdbg-check:$10 = {__0 = 8, __1 = 9}
-// gdbr-check:$10 = (8, 9)
+// gdbr-check:$10 = {8, 9}
 
 // gdb-command:print padded_struct.length
 // gdb-check:$11 = 2
 // gdb-command:print padded_struct.data_ptr[0]
 // gdbg-check:$12 = {x = 10, y = 11, z = 12}
-// gdbr-check:$12 = vec_slices::AStruct {x: 10, y: 11, z: 12}
+// gdbr-check:$12 = AStruct = {x = 10, y = 11, z = 12}
 // gdb-command:print padded_struct.data_ptr[1]
 // gdbg-check:$13 = {x = 13, y = 14, z = 15}
-// gdbr-check:$13 = vec_slices::AStruct {x: 13, y: 14, z: 15}
+// gdbr-check:$13 = AStruct = {x = 13, y = 14, z = 15}
 
 // gdbg-command:print 'vec_slices::MUT_VECT_SLICE'.length
 // gdbr-command:print MUT_VECT_SLICE.length