diff --git a/src/etc/lldb_commands b/src/etc/lldb_commands
index 24198952f4d0..6db81ce9be4d 100644
--- a/src/etc/lldb_commands
+++ b/src/etc/lldb_commands
@@ -77,6 +77,7 @@ type synthetic add -l lldb_lookup.synthetic_lookup -x "^enum2\$<.+>::.*$" --cate
 
 # Tuple
 type synthetic add -l lldb_lookup.TupleSyntheticProvider -x "^\(.*\)$" --category Rust
+type summary add -F lldb_lookup.TupleSummaryProvider -x "^\(.*\)$" --category Rust
 
 ## MSVC
 type synthetic add -l lldb_lookup.MSVCTupleSyntheticProvider -x "^tuple\$<.+>$" --category Rust
diff --git a/tests/debuginfo/associated-types.rs b/tests/debuginfo/associated-types.rs
index ac994b9d5ebc..5944cc14a1e8 100644
--- a/tests/debuginfo/associated-types.rs
+++ b/tests/debuginfo/associated-types.rs
@@ -53,7 +53,7 @@
 //@ lldb-command:continue
 
 //@ lldb-command:v arg
-//@ lldb-check:[...] { 0 = 4 1 = 5 }
+//@ lldb-check:[...] (4, 5)
 //@ lldb-command:continue
 
 //@ lldb-command:v a
diff --git a/tests/debuginfo/borrowed-tuple.rs b/tests/debuginfo/borrowed-tuple.rs
index 901d7f6ed08b..411e1b0a1582 100644
--- a/tests/debuginfo/borrowed-tuple.rs
+++ b/tests/debuginfo/borrowed-tuple.rs
@@ -21,13 +21,13 @@
 //@ lldb-command:run
 
 //@ lldb-command:v *stack_val_ref
-//@ lldb-check:[...] { 0 = -14 1 = -19 }
+//@ lldb-check:[...] (-14, -19)
 
 //@ lldb-command:v *ref_to_unnamed
-//@ lldb-check:[...] { 0 = -15 1 = -20 }
+//@ lldb-check:[...] (-15, -20)
 
 //@ lldb-command:v *unique_val_ref
-//@ lldb-check:[...] { 0 = -17 1 = -22 }
+//@ lldb-check:[...] (-17, -22)
 
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/box.rs b/tests/debuginfo/box.rs
index 3d9d568e8e63..2431ccc000a0 100644
--- a/tests/debuginfo/box.rs
+++ b/tests/debuginfo/box.rs
@@ -18,7 +18,7 @@
 //@ lldb-command:v *a
 //@ lldb-check:[...] 1
 //@ lldb-command:v *b
-//@ lldb-check:[...] { 0 = 2 1 = 3.5 }
+//@ lldb-check:[...] (2, 3.5)
 
 #![allow(unused_variables)]
 
diff --git a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
index 9f36e3d89ee9..42874f9afe10 100644
--- a/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
+++ b/tests/debuginfo/by-value-self-argument-in-trait-impl.rs
@@ -32,7 +32,7 @@
 //@ lldb-command:continue
 
 //@ lldb-command:v self
-//@ lldb-check:[...] { 0 = 4444.5 1 = 5555 2 = 6666 3 = 7777.5 }
+//@ lldb-check:[...] (4444.5, 5555, 6666, 7777.5)
 //@ lldb-command:continue
 
 trait Trait {
diff --git a/tests/debuginfo/c-style-enum-in-composite.rs b/tests/debuginfo/c-style-enum-in-composite.rs
index d28ad6cc7370..2362eee008bb 100644
--- a/tests/debuginfo/c-style-enum-in-composite.rs
+++ b/tests/debuginfo/c-style-enum-in-composite.rs
@@ -32,13 +32,13 @@
 //@ lldb-command:run
 
 //@ lldb-command:v tuple_interior_padding
-//@ lldb-check:[...] { 0 = 0 1 = OneHundred }
+//@ lldb-check:[...] (0, OneHundred)
 
 //@ lldb-command:v tuple_padding_at_end
-//@ lldb-check:[...] ((1, OneThousand), 2) { 0 = (1, OneThousand) { 0 = 1 1 = OneThousand } 1 = 2 }
+//@ lldb-check:[...] ((1, OneThousand), 2)
 
 //@ lldb-command:v tuple_different_enums
-//@ lldb-check:[...] { 0 = OneThousand 1 = MountainView 2 = OneMillion 3 = Vienna }
+//@ lldb-check:[...] (OneThousand, MountainView, OneMillion, Vienna)
 
 //@ lldb-command:v padded_struct
 //@ lldb-check:[...] { a = 3 b = OneMillion c = 4 d = Toronto e = 5 }
@@ -50,7 +50,7 @@
 //@ lldb-check:[...] { a = OneMillion b = MountainView c = OneThousand d = Toronto }
 
 //@ lldb-command:v struct_with_drop
-//@ lldb-check:[...] { 0 = { a = OneHundred b = Vienna } 1 = 9 }
+//@ lldb-check:[...] ({a:OneHundred, b:Vienna}, 9)
 
 #![allow(unused_variables)]
 
diff --git a/tests/debuginfo/cross-crate-spans.rs b/tests/debuginfo/cross-crate-spans.rs
index 97fcda13fe4b..e752baf9d263 100644
--- a/tests/debuginfo/cross-crate-spans.rs
+++ b/tests/debuginfo/cross-crate-spans.rs
@@ -35,7 +35,7 @@
 //@ lldb-command:run
 
 //@ lldb-command:v result
-//@ lldb-check:[...] { 0 = 17 1 = 17 }
+//@ lldb-check:[...] (17, 17)
 //@ lldb-command:v a_variable
 //@ lldb-check:[...] 123456789
 //@ lldb-command:v another_variable
@@ -43,7 +43,7 @@
 //@ lldb-command:continue
 
 //@ lldb-command:v result
-//@ lldb-check:[...] { 0 = 1212 1 = 1212 }
+//@ lldb-check:[...] (1212, 1212)
 //@ lldb-command:v a_variable
 //@ lldb-check:[...] 123456789
 //@ lldb-command:v another_variable
diff --git a/tests/debuginfo/destructured-fn-argument.rs b/tests/debuginfo/destructured-fn-argument.rs
index af9e620e6151..def1d159c598 100644
--- a/tests/debuginfo/destructured-fn-argument.rs
+++ b/tests/debuginfo/destructured-fn-argument.rs
@@ -172,7 +172,7 @@
 //@ lldb-command:v a
 //@ lldb-check:[...] 5
 //@ lldb-command:v b
-//@ lldb-check:[...] { 0 = 6 1 = 7 }
+//@ lldb-check:[...] (6, 7)
 //@ lldb-command:continue
 
 //@ lldb-command:v h
@@ -234,11 +234,11 @@
 //@ lldb-command:continue
 
 //@ lldb-command:v aa
-//@ lldb-check:[...] { 0 = 34 1 = 35 }
+//@ lldb-check:[...] (34, 35)
 //@ lldb-command:continue
 
 //@ lldb-command:v bb
-//@ lldb-check:[...] { 0 = 36 1 = 37 }
+//@ lldb-check:[...] (36, 37)
 //@ lldb-command:continue
 
 //@ lldb-command:v cc
@@ -246,17 +246,17 @@
 //@ lldb-command:continue
 
 //@ lldb-command:v dd
-//@ lldb-check:[...] { 0 = 40 1 = 41 2 = 42 }
+//@ lldb-check:[...] (40, 41, 42)
 //@ lldb-command:continue
 
 //@ lldb-command:v *ee
-//@ lldb-check:[...] { 0 = 43 1 = 44 2 = 45 }
+//@ lldb-check:[...] (43, 44, 45)
 //@ lldb-command:continue
 
 //@ lldb-command:v *ff
 //@ lldb-check:[...] 46
 //@ lldb-command:v gg
-//@ lldb-check:[...] { 0 = 47 1 = 48 }
+//@ lldb-check:[...] (47, 48)
 //@ lldb-command:continue
 
 //@ lldb-command:v *hh
diff --git a/tests/debuginfo/destructured-for-loop-variable.rs b/tests/debuginfo/destructured-for-loop-variable.rs
index 8ea6f70aa049..5febb9e77e71 100644
--- a/tests/debuginfo/destructured-for-loop-variable.rs
+++ b/tests/debuginfo/destructured-for-loop-variable.rs
@@ -138,7 +138,7 @@
 //@ lldb-command:continue
 
 //@ lldb-command:v simple_tuple_ident
-//@ lldb-check:[...] { 0 = 34903493 1 = 232323 }
+//@ lldb-check:[...] (34903493, 232323)
 //@ lldb-command:continue
 
 #![allow(unused_variables)]
diff --git a/tests/debuginfo/destructured-local.rs b/tests/debuginfo/destructured-local.rs
index 13399480ca44..0f7667a13520 100644
--- a/tests/debuginfo/destructured-local.rs
+++ b/tests/debuginfo/destructured-local.rs
@@ -136,7 +136,7 @@
 //@ lldb-command:v f
 //@ lldb-check:[...] 5
 //@ lldb-command:v g
-//@ lldb-check:[...] { 0 = 6 1 = 7 }
+//@ lldb-check:[...] (6, 7)
 
 //@ lldb-command:v h
 //@ lldb-check:[...] 8
@@ -190,25 +190,25 @@
 //@ lldb-check:[...] 33
 
 //@ lldb-command:v aa
-//@ lldb-check:[...] { 0 = 34 1 = 35 }
+//@ lldb-check:[...] (34, 35)
 
 //@ lldb-command:v bb
-//@ lldb-check:[...] { 0 = 36 1 = 37 }
+//@ lldb-check:[...] (36, 37)
 
 //@ lldb-command:v cc
 //@ lldb-check:[...] 38
 
 //@ lldb-command:v dd
-//@ lldb-check:[...] { 0 = 40 1 = 41 2 = 42 }
+//@ lldb-check:[...] (40, 41, 42)
 
 //@ lldb-command:v *ee
-//@ lldb-check:[...] { 0 = 43 1 = 44 2 = 45 }
+//@ lldb-check:[...] (43, 44, 45)
 
 //@ lldb-command:v *ff
 //@ lldb-check:[...] 46
 
 //@ lldb-command:v gg
-//@ lldb-check:[...] { 0 = 47 1 = 48 }
+//@ lldb-check:[...] (47, 48)
 
 //@ lldb-command:v *hh
 //@ lldb-check:[...] 50
diff --git a/tests/debuginfo/generic-method-on-generic-struct.rs b/tests/debuginfo/generic-method-on-generic-struct.rs
index 54e0798c90dc..6ec2151e2cdb 100644
--- a/tests/debuginfo/generic-method-on-generic-struct.rs
+++ b/tests/debuginfo/generic-method-on-generic-struct.rs
@@ -58,7 +58,7 @@
 
 // STACK BY REF
 //@ lldb-command:v *self
-//@ lldb-check:[...] { x = (8888, -8888) { 0 = 8888 1 = -8888 } }
+//@ lldb-check:[...] { x = (8888, -8888) }
 //@ lldb-command:v arg1
 //@ lldb-check:[...] -1
 //@ lldb-command:v arg2
@@ -67,7 +67,7 @@
 
 // STACK BY VAL
 //@ lldb-command:v self
-//@ lldb-check:[...] { x = (8888, -8888) { 0 = 8888 1 = -8888 } }
+//@ lldb-check:[...] { x = (8888, -8888) }
 //@ lldb-command:v arg1
 //@ lldb-check:[...] -3
 //@ lldb-command:v arg2
diff --git a/tests/debuginfo/method-on-generic-struct.rs b/tests/debuginfo/method-on-generic-struct.rs
index e050d3074f44..6194cd58bbb0 100644
--- a/tests/debuginfo/method-on-generic-struct.rs
+++ b/tests/debuginfo/method-on-generic-struct.rs
@@ -58,7 +58,7 @@
 
 // STACK BY REF
 //@ lldb-command:v *self
-//@ lldb-check:[...]Struct<(u32, i32)>) *self = { x = (8888, -8888) { 0 = 8888 1 = -8888 } }
+//@ lldb-check:[...]Struct<(u32, i32)>) *self = { x = (8888, -8888) }
 //@ lldb-command:v arg1
 //@ lldb-check:[...] -1
 //@ lldb-command:v arg2
@@ -67,7 +67,7 @@
 
 // STACK BY VAL
 //@ lldb-command:v self
-//@ lldb-check:[...]Struct<(u32, i32)>) self = { x = (8888, -8888) { 0 = 8888 1 = -8888 } }
+//@ lldb-check:[...]Struct<(u32, i32)>) self = { x = (8888, -8888) }
 //@ lldb-command:v arg1
 //@ lldb-check:[...] -3
 //@ lldb-command:v arg2
diff --git a/tests/debuginfo/pretty-std-collections.rs b/tests/debuginfo/pretty-std-collections.rs
index 85292cdad67a..4f0b51e8589d 100644
--- a/tests/debuginfo/pretty-std-collections.rs
+++ b/tests/debuginfo/pretty-std-collections.rs
@@ -59,7 +59,7 @@
 //@ lldb-check:[...] size=7 { [0] = 2 [1] = 3 [2] = 4 [3] = 5 [4] = 6 [5] = 7 [6] = 8 }
 
 //@ lldb-command:v hash_map
-//@ lldb-check:[...] size=4 { [0] = (1, 10) { 0 = 1 1 = 10 } [1] = (2, 20) { 0 = 2 1 = 20 } [2] = (3, 30) { 0 = 3 1 = 30 } [3] = (4, 40) { 0 = 4 1 = 40 } }
+//@ lldb-check:[...] size=4 { [0] = (1, 10) [1] = (2, 20) [2] = (3, 30) [3] = (4, 40) }
 
 //@ lldb-command:v hash_set
 //@ lldb-check:[...] size=4 { [0] = 1 [1] = 2 [2] = 3 [3] = 4 }
diff --git a/tests/debuginfo/simple-tuple.rs b/tests/debuginfo/simple-tuple.rs
index a82070900aaf..65eac8bca557 100644
--- a/tests/debuginfo/simple-tuple.rs
+++ b/tests/debuginfo/simple-tuple.rs
@@ -61,23 +61,24 @@
 // === LLDB TESTS ==================================================================================
 
 //@ lldb-command:run
-
+//@ lldb-command: type format add -f u u8 "unsigned char"
+//@ lldb-command: type format add -f d i8 char "signed char"
 //@ lldb-command:v/d noPadding8
-//@ lldb-check:[...] { 0 = -100 1 = 100 }
+//@ lldb-check:[...] (-100, 100)
 //@ lldb-command:v noPadding16
-//@ lldb-check:[...] { 0 = 0 1 = 1 2 = 2 }
+//@ lldb-check:[...] (0, 1, 2)
 //@ lldb-command:v noPadding32
-//@ lldb-check:[...] { 0 = 3 1 = 4.5 2 = 5 }
+//@ lldb-check:[...] (3, 4.5, 5)
 //@ lldb-command:v noPadding64
-//@ lldb-check:[...] { 0 = 6 1 = 7.5 2 = 8 }
+//@ lldb-check:[...] (6, 7.5, 8)
 
 //@ lldb-command:v internalPadding1
-//@ lldb-check:[...] { 0 = 9 1 = 10 }
+//@ lldb-check:[...] (9, 10)
 //@ lldb-command:v internalPadding2
-//@ lldb-check:[...] { 0 = 11 1 = 12 2 = 13 3 = 14 }
+//@ lldb-check:[...] (11, 12, 13, 14)
 
 //@ lldb-command:v paddingAtEnd
-//@ lldb-check:[...] { 0 = 15 1 = 16 }
+//@ lldb-check:[...] (15, 16)
 
 
 // === CDB TESTS ==================================================================================
diff --git a/tests/debuginfo/tuple-in-tuple.rs b/tests/debuginfo/tuple-in-tuple.rs
index 98e2daf623ef..fe49aeb6da8e 100644
--- a/tests/debuginfo/tuple-in-tuple.rs
+++ b/tests/debuginfo/tuple-in-tuple.rs
@@ -29,21 +29,21 @@
 //@ lldb-command:run
 
 //@ lldb-command:v no_padding1
-//@ lldb-check:[...] ((0, 1), 2, 3) { 0 = (0, 1) { 0 = 0 1 = 1 } 1 = 2 2 = 3 }
+//@ lldb-check:[...] ((0, 1), 2, 3)
 //@ lldb-command:v no_padding2
-//@ lldb-check:[...] (4, (5, 6), 7) { 0 = 4 1 = (5, 6) { 0 = 5 1 = 6 } 2 = 7 }
+//@ lldb-check:[...] (4, (5, 6), 7)
 //@ lldb-command:v no_padding3
-//@ lldb-check:[...] (8, 9, (10, 11)) { 0 = 8 1 = 9 2 = (10, 11) { 0 = 10 1 = 11 } }
+//@ lldb-check:[...] (8, 9, (10, 11))
 
 //@ lldb-command:v internal_padding1
-//@ lldb-check:[...] (12, (13, 14)) { 0 = 12 1 = (13, 14) { 0 = 13 1 = 14 } }
+//@ lldb-check:[...] (12, (13, 14))
 //@ lldb-command:v internal_padding2
-//@ lldb-check:[...] (15, (16, 17)) { 0 = 15 1 = (16, 17) { 0 = 16 1 = 17 } }
+//@ lldb-check:[...] (15, (16, 17))
 
 //@ lldb-command:v padding_at_end1
-//@ lldb-check:[...] (18, (19, 20)) { 0 = 18 1 = (19, 20) { 0 = 19 1 = 20 } }
+//@ lldb-check:[...] (18, (19, 20))
 //@ lldb-command:v padding_at_end2
-//@ lldb-check:[...] ((21, 22), 23) { 0 = (21, 22) { 0 = 21 1 = 22 } 1 = 23 }
+//@ lldb-check:[...] ((21, 22), 23)
 
 
 // === CDB TESTS ==================================================================================
diff --git a/tests/debuginfo/union-smoke.rs b/tests/debuginfo/union-smoke.rs
index 884a1f3e6992..9934a3291441 100644
--- a/tests/debuginfo/union-smoke.rs
+++ b/tests/debuginfo/union-smoke.rs
@@ -14,10 +14,10 @@
 
 //@ lldb-command:run
 //@ lldb-command:v u
-//@ lldb-check:[...] { a = ('\x02', '\x02') { 0 = '\x02' 1 = '\x02' } b = 514 }
+//@ lldb-check:[...] { a = ('\x02', '\x02') b = 514 }
 
 //@ lldb-command:print union_smoke::SU
-//@ lldb-check:[...] { a = ('\x01', '\x01') { 0 = '\x01' 1 = '\x01' } b = 257 }
+//@ lldb-check:[...] { a = ('\x01', '\x01') b = 257 }
 
 #![allow(unused)]
 
diff --git a/tests/debuginfo/unique-enum.rs b/tests/debuginfo/unique-enum.rs
index 3bc6ce259655..6ba20c5bec00 100644
--- a/tests/debuginfo/unique-enum.rs
+++ b/tests/debuginfo/unique-enum.rs
@@ -27,10 +27,10 @@
 //@ lldb-check:(unique_enum::ABC) *the_a = TheA{x:0, y:8970181431921507452} { x = 0 y = 8970181431921507452 }
 
 //@ lldb-command:v *the_b
-//@ lldb-check:(unique_enum::ABC) *the_b = TheB(0, 286331153, 286331153) { 0 = 0 1 = 286331153 2 = 286331153 }
+//@ lldb-check:(unique_enum::ABC) *the_b = TheB(0, 286331153, 286331153)
 
 //@ lldb-command:v *univariant
-//@ lldb-check:(unique_enum::Univariant) *univariant = TheOnlyCase(123234) { 0 = 123234 }
+//@ lldb-check:(unique_enum::Univariant) *univariant = TheOnlyCase(123234)
 
 #![allow(unused_variables)]
 
diff --git a/tests/debuginfo/vec-slices.rs b/tests/debuginfo/vec-slices.rs
index e7f6fd03e541..ad31ca8fff2f 100644
--- a/tests/debuginfo/vec-slices.rs
+++ b/tests/debuginfo/vec-slices.rs
@@ -67,7 +67,7 @@
 //@ lldb-check:[...] size=2 { [0] = 3 [1] = 4 }
 
 //@ lldb-command:v padded_tuple
-//@ lldb-check:[...] size=2 { [0] = (6, 7) { 0 = 6 1 = 7 } [1] = (8, 9) { 0 = 8 1 = 9 } }
+//@ lldb-check:[...] size=2 { [0] = (6, 7) [1] = (8, 9) }
 
 //@ lldb-command:v padded_struct
 //@ lldb-check:[...] size=2 { [0] = { x = 10 y = 11 z = 12 } [1] = { x = 13 y = 14 z = 15 } }