Auto merge of #1338 - RalfJung:test-cleanup, r=RalfJung

Cleanup some run-pass tests

Author: bors

tests/run-pass/bitop-beyond-alignment.rs

@@ -8,14 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(dead_code)]
-
 use std::mem;
 
 enum Tag<A> {
     Tag2(A)
 }
 
+#[allow(dead_code)]
 struct Rec {
     c8: u8,
     t: Tag<u64>

tests/run-pass/dst-field-align.rs

@@ -1,5 +1,4 @@
-#![allow(dead_code)]
-
+#[allow(dead_code)]
 struct Foo<T: ?Sized> {
     a: u16,
     b: T
@@ -17,6 +16,7 @@ struct Baz<T: ?Sized> {
     a: T
 }
 
+#[allow(dead_code)]
 struct HasDrop<T: ?Sized> {
     ptr: Box<usize>,
     data: T

tests/run-pass/foreign-fn-linkname.rs

@@ -1,7 +1,5 @@
 //ignore-windows: Uses POSIX APIs
-
 #![feature(rustc_private)]
-#![allow(unused_extern_crates)] // rustc bug https://github.com/rust-lang/rust/issues/56098
 
 extern crate libc;
 

tests/run-pass/issue-15063.rs

@@ -1,5 +1,4 @@
-#![allow(dead_code)]
-
+#[allow(dead_code)]
 enum Two { A, B }
 impl Drop for Two {
     fn drop(&mut self) {

tests/run-pass/issue-35815.rs

@@ -1,7 +1,6 @@
-#![allow(dead_code)]
-
 use std::mem;
 
+#[allow(dead_code)]
 struct Foo<T: ?Sized> {
     a: i64,
     b: bool,

tests/run-pass/issue-53728.rs

@@ -1,14 +1,16 @@
-#![allow(dead_code)]
-
 #[repr(u16)]
+#[allow(dead_code)]
 enum DeviceKind {
     Nil = 0,
 }
+
 #[repr(packed)]
+#[allow(dead_code)]
 struct DeviceInfo {
     endianness: u8,
     device_kind: DeviceKind,
 }
+
 fn main() {
     let _x = None::<(DeviceInfo, u8)>;
     let _y = None::<(DeviceInfo, u16)>;

tests/run-pass/libc.rs

@@ -2,14 +2,12 @@
 // compile-flags: -Zmiri-disable-isolation
 
 #![feature(rustc_private)]
-#![allow(unused)] // necessary on macos due to conditional compilation
-
-use std::path::PathBuf;
 
 extern crate libc;
 
-fn tmp() -> PathBuf {
-    std::env::var("MIRI_TEMP").map(PathBuf::from).unwrap_or_else(|_| std::env::temp_dir())
+#[cfg(target_os = "linux")]
+fn tmp() -> std::path::PathBuf {
+    std::env::var("MIRI_TEMP").map(std::path::PathBuf::from).unwrap_or_else(|_| std::env::temp_dir())
 }
 
 #[cfg(target_os = "linux")]

tests/run-pass/packed_static.rs

@@ -1,31 +1,53 @@
-#![allow(dead_code)]
 #![feature(unsize, coerce_unsized)]
 
-#[repr(packed)]
-struct S {
-    a: i32,
-    b: i64,
-}
 
-#[repr(packed)]
-struct Test1<'a> {
-    x: u8,
-    other: &'a u32,
-}
+fn test_basic() {
+    #[repr(packed)]
+    struct S {
+        a: i32,
+        b: i64,
+    }
 
-#[repr(packed)]
-struct Test2<'a> {
-    x: u8,
-    other: &'a Test1<'a>,
-}
+    #[repr(packed)]
+    #[allow(dead_code)]
+    struct Test1<'a> {
+        x: u8,
+        other: &'a u32,
+    }
+
+    #[repr(packed)]
+    #[allow(dead_code)]
+    struct Test2<'a> {
+        x: u8,
+        other: &'a Test1<'a>,
+    }
+
+    fn test(t: Test2) {
+        let x = *t.other.other;
+        assert_eq!(x, 42);
+    }
+
+    let mut x = S {
+        a: 42,
+        b: 99,
+    };
+    let a = x.a;
+    let b = x.b;
+    assert_eq!(a, 42);
+    assert_eq!(b, 99);
+    // can't do `assert_eq!(x.a, 42)`, because `assert_eq!` takes a reference
+    assert_eq!({x.a}, 42);
+    assert_eq!({x.b}, 99);
 
-fn test(t: Test2) {
-    let x = *t.other.other;
-    assert_eq!(x, 42);
+    x.b = 77;
+    assert_eq!({x.b}, 77);
+
+    test(Test2 { x: 0, other: &Test1 { x: 0, other: &42 }});
 }
 
 fn test_unsizing() {
     #[repr(packed)]
+    #[allow(dead_code)]
     struct UnalignedPtr<'a, T: ?Sized>
     where T: 'a,
     {
@@ -81,25 +103,21 @@ fn test_inner_packed() {
     let _o2 = o.clone();
 }
 
-fn main() {
-    let mut x = S {
-        a: 42,
-        b: 99,
-    };
-    let a = x.a;
-    let b = x.b;
-    assert_eq!(a, 42);
-    assert_eq!(b, 99);
-    // can't do `assert_eq!(x.a, 42)`, because `assert_eq!` takes a reference
-    assert_eq!({x.a}, 42);
-    assert_eq!({x.b}, 99);
+fn test_static() {
+    #[repr(packed)]
+    struct Foo {
+        i: i32
+    }
 
-    x.b = 77;
-    assert_eq!({x.b}, 77);
+    static FOO: Foo = Foo { i: 42 };
 
-    test(Test2 { x: 0, other: &Test1 { x: 0, other: &42 }});
+    assert_eq!({FOO.i}, 42);
+}
 
+fn main() {
+    test_basic();
     test_unsizing();
     test_drop();
     test_inner_packed();
+    test_static();
 }