From b2dae987f8d0118be944434f0504f5fefd8737c4 Mon Sep 17 00:00:00 2001
From: Ben Kimock <kimockb@gmail.com>
Date: Sun, 18 Aug 2024 17:41:01 -0400
Subject: [PATCH] Fixup tests

---
 tests/debuginfo/associated-types.rs                 |  4 ++--
 tests/debuginfo/generic-method-on-generic-struct.rs |  4 ++--
 tests/debuginfo/generic-struct.rs                   |  8 ++++----
 tests/debuginfo/method-on-generic-struct.rs         | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/debuginfo/associated-types.rs b/tests/debuginfo/associated-types.rs
index 95e74210472..b20bd520936 100644
--- a/tests/debuginfo/associated-types.rs
+++ b/tests/debuginfo/associated-types.rs
@@ -37,7 +37,7 @@
 // lldb-command:run
 
 // lldb-command:v arg
-// lldb-check:[...] { b = -1, b1 = 0 }
+// lldb-check:[...] { b = -1 b1 = 0 }
 // lldb-command:continue
 
 // lldb-command:v inferred
@@ -51,7 +51,7 @@
 // lldb-command:continue
 
 // lldb-command:v arg
-// lldb-check:[...] (4, 5)
+// lldb-check:[...] { 0 = 4 1 = 5 }
 // lldb-command:continue
 
 // lldb-command:v a
diff --git a/tests/debuginfo/generic-method-on-generic-struct.rs b/tests/debuginfo/generic-method-on-generic-struct.rs
index a391fbf0826..9c587ca2839 100644
--- a/tests/debuginfo/generic-method-on-generic-struct.rs
+++ b/tests/debuginfo/generic-method-on-generic-struct.rs
@@ -56,7 +56,7 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldb-check:[...] { x = { 0 = 8888, 1 = -8888 } }
+// lldb-check:[...] { x = { 0 = 8888 1 = -8888 } }
 // lldb-command:v arg1
 // lldb-check:[...] -1
 // lldb-command:v arg2
@@ -65,7 +65,7 @@
 
 // STACK BY VAL
 // lldb-command:v self
-// lldb-check:[...] { x = { 0 = 8888, 1 = -8888 } }
+// lldb-check:[...] { x = { 0 = 8888 1 = -8888 } }
 // lldb-command:v arg1
 // lldb-check:[...] -3
 // lldb-command:v arg2
diff --git a/tests/debuginfo/generic-struct.rs b/tests/debuginfo/generic-struct.rs
index 09160bc3ba0..f26d823d4f2 100644
--- a/tests/debuginfo/generic-struct.rs
+++ b/tests/debuginfo/generic-struct.rs
@@ -18,14 +18,14 @@
 // lldb-command:run
 
 // lldb-command:v int_int
-// lldb-check:[...] AGenericStruct<i32, i32> { key: 0, value: 1 }
+// lldb-check:[...]AGenericStruct<int, int>) int_int = { key = 0 value = 1 }
 // lldb-command:v int_float
-// lldb-check:[...] AGenericStruct<i32, f64> { key: 2, value: 3.5 }
+// lldb-check:[...]AGenericStruct<int, double>) int_float = { key = 2 value = 3.5 }
 // lldb-command:v float_int
-// lldb-check:[...] AGenericStruct<f64, i32> { key: 4.5, value: 5 }
+// lldb-check:[...]AGenericStruct<double, int>) float_int = { key = 4.5 value = 5 }
 
 // lldb-command:v float_int_float
-// lldb-check:[...] AGenericStruct<f64, generic_struct::AGenericStruct<i32, f64>> { key: 6.5, value: AGenericStruct<i32, f64> { key: 7, value: 8.5 } }
+// lldb-check:[...]AGenericStruct<double, generic_struct::AGenericStruct<int, double> >) float_int_float = { key = 6.5 value = { key = 7 value = 8.5 } }
 
 // === CDB TESTS ===================================================================================
 
diff --git a/tests/debuginfo/method-on-generic-struct.rs b/tests/debuginfo/method-on-generic-struct.rs
index 23617d46e83..1e6c9d66178 100644
--- a/tests/debuginfo/method-on-generic-struct.rs
+++ b/tests/debuginfo/method-on-generic-struct.rs
@@ -56,7 +56,7 @@
 
 // STACK BY REF
 // lldb-command:v *self
-// lldb-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
+// lldb-check:[...]Struct<(u32, i32)>) *self = { x = { 0 = 8888 1 = -8888 } }
 // lldb-command:v arg1
 // lldb-check:[...] -1
 // lldb-command:v arg2
@@ -65,7 +65,7 @@
 
 // STACK BY VAL
 // lldb-command:v self
-// lldb-check:[...] Struct<(u32, i32)> { x: (8888, -8888) }
+// lldb-check:[...]Struct<(u32, i32)>) self = { x = { 0 = 8888 1 = -8888 } }
 // lldb-command:v arg1
 // lldb-check:[...] -3
 // lldb-command:v arg2
@@ -74,7 +74,7 @@
 
 // OWNED BY REF
 // lldb-command:v *self
-// lldb-check:[...] Struct<f64> { x: 1234.5 }
+// lldb-check:[...]Struct<double>) *self = { x = 1234.5 }
 // lldb-command:v arg1
 // lldb-check:[...] -5
 // lldb-command:v arg2
@@ -83,7 +83,7 @@
 
 // OWNED BY VAL
 // lldb-command:v self
-// lldb-check:[...] Struct<f64> { x: 1234.5 }
+// lldb-check:[...]Struct<double>) self = { x = 1234.5 }
 // lldb-command:v arg1
 // lldb-check:[...] -7
 // lldb-command:v arg2
@@ -92,7 +92,7 @@
 
 // OWNED MOVED
 // lldb-command:v *self
-// lldb-check:[...] Struct<f64> { x: 1234.5 }
+// lldb-check:[...]Struct<double>) *self = { x = 1234.5 }
 // lldb-command:v arg1
 // lldb-check:[...] -9
 // lldb-command:v arg2