test: address comments and pacify the merciless tidy.

8 files changed, 16 insertions, 20 deletions

diff --git a/src/test/auxiliary/rust_test_helpers.c b/src/test/auxiliary/rust_test_helpers.c
index a5299638e52..c1fe8b7743a 100644
--- a/src/test/auxiliary/rust_test_helpers.c
+++ b/src/test/auxiliary/rust_test_helpers.c
@@ -346,9 +346,9 @@ struct U8TaggedEnumOptionU64U64 {
     uint8_t tag;
     union {
         struct {
-	    uint64_t a;
-	    uint64_t b;
-	} some;
+            uint64_t a;
+            uint64_t b;
+        } some;
     };
 };
 
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs b/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
index 8f75076a30e..57c2c6127ed 100644
--- a/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
+++ b/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
@@ -1,6 +1,3 @@
-#![crate_type = "lib"]
-#![crate_name = "nonclike"]
-
 #[repr(C, u8)]
 pub enum TT {
     AA(u64, u64),
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c b/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c
index d34babcf3d3..0a1621e49f2 100644
--- a/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c
+++ b/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
   uint64_t rr = tt_add(xx, yy);
   assert(33 == rr);
 
-  /* This one returns an incorrect result. */
+  /* This one used to return an incorrect result (see issue #68190). */
   T x = { .tag = A, .a = { ._0 = 1 } };
   T y = { .tag = A, .a = { ._0 = 10 } };
   uint64_t r = t_add(x, y);
diff --git a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
index 22d6bdcb35b..517286a868d 100644
--- a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
+++ b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
@@ -1,6 +1,3 @@
-#![crate_type = "bin"]
-#![crate_name = "nonclike"]
-
 #[repr(C, u8)]
 pub enum TT {
     AA(u64, u64),
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
index 1a2686cacd0..ea22a2a56e0 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
@@ -1,6 +1,3 @@
-#![crate_type = "bin"]
-#![crate_name = "nonclike"]
-
 #[repr(C, u8)]
 pub enum TT {
     AA(u64, u64),
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs b/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
index 700d2df1f38..de529cf641a 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
@@ -1,6 +1,3 @@
-#![crate_type = "lib"]
-#![crate_name = "nonclike"]
-
 #[repr(C, u8)]
 pub enum TT {
     AA(u64, u64),
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/test.c b/src/test/run-make-fulldeps/return-non-c-like-enum/test.c
index 3cbd8e6a20c..afadd3c10c5 100644
--- a/src/test/run-make-fulldeps/return-non-c-like-enum/test.c
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum/test.c
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   assert(10 == tt.aa._0);
   assert(20 == tt.aa._1);
 
-  /* This one segfaults. */
+  /* This one used to segfault (see issue #68190). */
   T t = t_new(10);
   assert(A == t.tag);
   assert(10 == t.a._0);
diff --git a/src/test/ui/abi/abi-sysv64-arg-passing.rs b/src/test/ui/abi/abi-sysv64-arg-passing.rs
index adb62ab698e..c87353b93a7 100644
--- a/src/test/ui/abi/abi-sysv64-arg-passing.rs
+++ b/src/test/ui/abi/abi-sysv64-arg-passing.rs
@@ -139,7 +139,11 @@ mod tests {
         pub fn rust_dbg_abi_2(f: Floats) -> Floats;
         pub fn rust_dbg_new_some_u64u64(a: u64, b: u64) -> U8TaggedEnumOptionU64U64;
         pub fn rust_dbg_new_none_u64u64() -> U8TaggedEnumOptionU64U64;
-        pub fn rust_dbg_unpack_option_u64u64(o: U8TaggedEnumOptionU64U64, a: *mut u64, b: *mut u64) -> i32;
+        pub fn rust_dbg_unpack_option_u64u64(
+            o: U8TaggedEnumOptionU64U64,
+            a: *mut u64,
+            b: *mut u64,
+        ) -> i32;
         pub fn rust_dbg_new_some_u64(some: u64) -> U8TaggedEnumOptionU64;
         pub fn rust_dbg_new_none_u64() -> U8TaggedEnumOptionU64;
         pub fn rust_dbg_unpack_option_u64(o: U8TaggedEnumOptionU64, v: *mut u64) -> i32;
@@ -371,14 +375,18 @@ mod tests {
 
         let mut a: u64 = 0;
         let mut b: u64 = 0;
-        let r = unsafe { rust_dbg_unpack_option_u64u64(some_u64u64, &mut a as *mut _, &mut b as *mut _) };
+        let r = unsafe {
+            rust_dbg_unpack_option_u64u64(some_u64u64, &mut a as *mut _, &mut b as *mut _)
+        };
         assert_eq!(1, r);
         assert_eq!(10, a);
         assert_eq!(20, b);
 
         let mut a: u64 = 0;
         let mut b: u64 = 0;
-        let r = unsafe { rust_dbg_unpack_option_u64u64(none_u64u64, &mut a as *mut _, &mut b as *mut _) };
+        let r = unsafe {
+            rust_dbg_unpack_option_u64u64(none_u64u64, &mut a as *mut _, &mut b as *mut _)
+        };
         assert_eq!(0, r);
         assert_eq!(0, a);
         assert_eq!(0, b);