Update tests for extern block linting

27 files changed, 79 insertions, 84 deletions

diff --git a/src/test/ui/issues/auxiliary/issue-15562.rs b/src/test/ui/issues/auxiliary/issue-15562.rs
index d5afaaa5622..6ff26b47ea6 100644
--- a/src/test/ui/issues/auxiliary/issue-15562.rs
+++ b/src/test/ui/issues/auxiliary/issue-15562.rs
@@ -1,5 +1,5 @@
 #![crate_type = "lib"]
 
-extern {
+extern "C" {
     pub fn transmute();
 }
diff --git a/src/test/ui/issues/auxiliary/issue-16725.rs b/src/test/ui/issues/auxiliary/issue-16725.rs
index b75b5e2d8d7..9f9abd575bb 100644
--- a/src/test/ui/issues/auxiliary/issue-16725.rs
+++ b/src/test/ui/issues/auxiliary/issue-16725.rs
@@ -1,3 +1,3 @@
-extern {
+extern "C" {
     fn bar();
 }
diff --git a/src/test/ui/issues/auxiliary/issue-25185-1.rs b/src/test/ui/issues/auxiliary/issue-25185-1.rs
index 77a4787ba94..e957be9c1c1 100644
--- a/src/test/ui/issues/auxiliary/issue-25185-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-25185-1.rs
@@ -3,6 +3,6 @@
 #![crate_type = "rlib"]
 
 #[link(name = "rust_test_helpers", kind = "static")]
-extern {
+extern "C" {
     pub fn rust_dbg_extern_identity_u32(u: u32) -> u32;
 }
diff --git a/src/test/ui/issues/issue-10877.rs b/src/test/ui/issues/issue-10877.rs
index b57929be284..15a383175b9 100644
--- a/src/test/ui/issues/issue-10877.rs
+++ b/src/test/ui/issues/issue-10877.rs
@@ -1,12 +1,14 @@
-struct Foo { x: isize }
-extern {
+struct Foo {
+    x: isize,
+}
+extern "C" {
     fn foo(1: ());
     //~^ ERROR: patterns aren't allowed in foreign function declarations
     fn bar((): isize);
     //~^ ERROR: patterns aren't allowed in foreign function declarations
     fn baz(Foo { x }: isize);
     //~^ ERROR: patterns aren't allowed in foreign function declarations
-    fn qux((x,y): ());
+    fn qux((x, y): ());
     //~^ ERROR: patterns aren't allowed in foreign function declarations
     fn this_is_actually_ok(a: usize);
     fn and_so_is_this(_: usize);
diff --git a/src/test/ui/issues/issue-10877.stderr b/src/test/ui/issues/issue-10877.stderr
index 0f9dc211cea..bd3797cba55 100644
--- a/src/test/ui/issues/issue-10877.stderr
+++ b/src/test/ui/issues/issue-10877.stderr
@@ -1,26 +1,26 @@
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:3:12
+  --> $DIR/issue-10877.rs:5:12
    |
 LL |     fn foo(1: ());
    |            ^ pattern not allowed in foreign function
 
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:5:12
+  --> $DIR/issue-10877.rs:7:12
    |
 LL |     fn bar((): isize);
    |            ^^ pattern not allowed in foreign function
 
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:7:12
+  --> $DIR/issue-10877.rs:9:12
    |
 LL |     fn baz(Foo { x }: isize);
    |            ^^^^^^^^^ pattern not allowed in foreign function
 
 error[E0130]: patterns aren't allowed in foreign function declarations
-  --> $DIR/issue-10877.rs:9:12
+  --> $DIR/issue-10877.rs:11:12
    |
-LL |     fn qux((x,y): ());
-   |            ^^^^^ pattern not allowed in foreign function
+LL |     fn qux((x, y): ());
+   |            ^^^^^^ pattern not allowed in foreign function
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/issues/issue-1251.rs b/src/test/ui/issues/issue-1251.rs
index 7f25c9a787e..c2c047c7961 100644
--- a/src/test/ui/issues/issue-1251.rs
+++ b/src/test/ui/issues/issue-1251.rs
@@ -3,15 +3,14 @@
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test ffi with
-
 #![feature(rustc_private)]
 
 mod rustrt {
     extern crate libc;
 
-    extern {
+    extern "C" {
         pub fn rust_get_test_int() -> libc::intptr_t;
     }
 }
 
-pub fn main() { }
+pub fn main() {}
diff --git a/src/test/ui/issues/issue-14227.rs b/src/test/ui/issues/issue-14227.rs
index d80eefc41bf..a1fde14600a 100644
--- a/src/test/ui/issues/issue-14227.rs
+++ b/src/test/ui/issues/issue-14227.rs
@@ -1,4 +1,4 @@
-extern {
+extern "C" {
     pub static symbol: u32;
 }
 static CRASH: u32 = symbol;
diff --git a/src/test/ui/issues/issue-15487.rs b/src/test/ui/issues/issue-15487.rs
index 17b16a62a74..34ac53be5be 100644
--- a/src/test/ui/issues/issue-15487.rs
+++ b/src/test/ui/issues/issue-15487.rs
@@ -3,12 +3,11 @@
 // ignore-windows
 // ignore-wasm32-bare no libs to link
 // ignore-sgx no libs to link
-
 #![feature(link_args)]
 
-#[link_args="-lc  -lm"]
-#[link_args=" -lc"]
-#[link_args="-lc "]
-extern {}
+#[link_args = "-lc  -lm"]
+#[link_args = " -lc"]
+#[link_args = "-lc "]
+extern "C" {}
 
 fn main() {}
diff --git a/src/test/ui/issues/issue-16149.rs b/src/test/ui/issues/issue-16149.rs
index 7f0cad96a58..51b60725c5a 100644
--- a/src/test/ui/issues/issue-16149.rs
+++ b/src/test/ui/issues/issue-16149.rs
@@ -1,4 +1,4 @@
-extern {
+extern "C" {
     static externalValue: isize;
 }
 
@@ -6,6 +6,6 @@ fn main() {
     let boolValue = match 42 {
         externalValue => true,
         //~^ ERROR match bindings cannot shadow statics
-        _ => false
+        _ => false,
     };
 }
diff --git a/src/test/ui/issues/issue-16250.rs b/src/test/ui/issues/issue-16250.rs
index a3c6751ad89..436e2a6cee3 100644
--- a/src/test/ui/issues/issue-16250.rs
+++ b/src/test/ui/issues/issue-16250.rs
@@ -2,9 +2,8 @@
 
 pub struct Foo;
 
-extern {
+extern "C" {
     pub fn foo(x: (Foo)); //~ ERROR `extern` block uses type `Foo`
 }
 
-fn main() {
-}
+fn main() {}
diff --git a/src/test/ui/issues/issue-16538.rs b/src/test/ui/issues/issue-16538.rs
index 54d9a732912..7d6eefa5b1e 100644
--- a/src/test/ui/issues/issue-16538.rs
+++ b/src/test/ui/issues/issue-16538.rs
@@ -1,6 +1,6 @@
 mod Y {
     pub type X = usize;
-    extern {
+    extern "C" {
         pub static x: *const usize;
     }
     pub fn foo(value: *const X) -> *const X {
diff --git a/src/test/ui/issues/issue-1866.rs b/src/test/ui/issues/issue-1866.rs
index 9f8a3a82624..caac0c50414 100644
--- a/src/test/ui/issues/issue-1866.rs
+++ b/src/test/ui/issues/issue-1866.rs
@@ -9,7 +9,7 @@ mod a {
     pub type rust_task = usize;
     pub mod rustrt {
         use super::rust_task;
-        extern {
+        extern "C" {
             pub fn rust_task_is_unwinding(rt: *const rust_task) -> bool;
         }
     }
@@ -19,11 +19,11 @@ mod b {
     pub type rust_task = bool;
     pub mod rustrt {
         use super::rust_task;
-        extern {
+        extern "C" {
             pub fn rust_task_is_unwinding(rt: *const rust_task) -> bool;
-            //~^ WARN `rust_task_is_unwinding` redeclared with a different signature
+        //~^ WARN `rust_task_is_unwinding` redeclared with a different signature
         }
     }
 }
 
-pub fn main() { }
+pub fn main() {}
diff --git a/src/test/ui/issues/issue-18804/auxiliary/lib.rs b/src/test/ui/issues/issue-18804/auxiliary/lib.rs
index ae27dd520e9..e29d48285d8 100644
--- a/src/test/ui/issues/issue-18804/auxiliary/lib.rs
+++ b/src/test/ui/issues/issue-18804/auxiliary/lib.rs
@@ -1,10 +1,10 @@
 #![crate_type = "rlib"]
 #![feature(linkage)]
 
-pub fn foo<T>() -> *const() {
-    extern {
+pub fn foo<T>() -> *const () {
+    extern "C" {
         #[linkage = "extern_weak"]
-        static FOO: *const();
+        static FOO: *const ();
     }
     unsafe { FOO }
 }
diff --git a/src/test/ui/issues/issue-20313-rpass.rs b/src/test/ui/issues/issue-20313-rpass.rs
index 09352044b01..591f3659e98 100644
--- a/src/test/ui/issues/issue-20313-rpass.rs
+++ b/src/test/ui/issues/issue-20313-rpass.rs
@@ -1,13 +1,11 @@
 // run-pass
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
-
 #![feature(link_llvm_intrinsics)]
 
-extern {
+extern "C" {
     #[link_name = "llvm.sqrt.f32"]
     fn sqrt(x: f32) -> f32;
 }
 
-fn main(){
-}
+fn main() {}
diff --git a/src/test/ui/issues/issue-20313.rs b/src/test/ui/issues/issue-20313.rs
index 4149ab4a302..a72af650c70 100644
--- a/src/test/ui/issues/issue-20313.rs
+++ b/src/test/ui/issues/issue-20313.rs
@@ -1,7 +1,6 @@
-extern {
+extern "C" {
     #[link_name = "llvm.sqrt.f32"]
     fn sqrt(x: f32) -> f32; //~ ERROR linking to LLVM intrinsics is experimental
 }
 
-fn main(){
-}
+fn main() {}
diff --git a/src/test/ui/issues/issue-2214.rs b/src/test/ui/issues/issue-2214.rs
index 52ab29f4235..1994c3515ab 100644
--- a/src/test/ui/issues/issue-2214.rs
+++ b/src/test/ui/issues/issue-2214.rs
@@ -5,13 +5,11 @@
 
 extern crate libc;
 
-use std::mem;
 use libc::{c_double, c_int};
+use std::mem;
 
 fn to_c_int(v: &mut isize) -> &mut c_int {
-    unsafe {
-        mem::transmute_copy(&v)
-    }
+    unsafe { mem::transmute_copy(&v) }
 }
 
 fn lgamma(n: c_double, value: &mut isize) -> c_double {
@@ -23,21 +21,21 @@ fn lgamma(n: c_double, value: &mut isize) -> c_double {
 mod m {
     use libc::{c_double, c_int};
 
-    extern {
+    extern "C" {
         #[cfg(all(unix, not(target_os = "vxworks")))]
         #[link_name="lgamma_r"]
         pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
         #[cfg(windows)]
-        #[link_name="lgamma"]
+        #[link_name = "lgamma"]
         pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
         #[cfg(target_os = "vxworks")]
-        #[link_name="lgamma"]
+        #[link_name = "lgamma"]
         pub fn lgamma(n: c_double, sign: &mut c_int) -> c_double;
     }
 }
 
 pub fn main() {
-  let mut y: isize = 5;
-  let x: &mut isize = &mut y;
-  assert_eq!(lgamma(1.0 as c_double, x), 0.0 as c_double);
+    let mut y: isize = 5;
+    let x: &mut isize = &mut y;
+    assert_eq!(lgamma(1.0 as c_double, x), 0.0 as c_double);
 }
diff --git a/src/test/ui/issues/issue-28324.rs b/src/test/ui/issues/issue-28324.rs
index bb48508a4a4..f74726e8166 100644
--- a/src/test/ui/issues/issue-28324.rs
+++ b/src/test/ui/issues/issue-28324.rs
@@ -1,4 +1,4 @@
-extern {
+extern "C" {
     static error_message_count: u32;
 }
 
diff --git a/src/test/ui/issues/issue-28472.rs b/src/test/ui/issues/issue-28472.rs
index 17d74ea0cf4..6db1f9a5bdd 100644
--- a/src/test/ui/issues/issue-28472.rs
+++ b/src/test/ui/issues/issue-28472.rs
@@ -1,6 +1,6 @@
 // Check that the visibility modifier is included in the span of foreign items.
 
-extern {
+extern "C" {
   fn foo();
 
   pub //~ ERROR the name `foo` is defined multiple times
diff --git a/src/test/ui/issues/issue-28676.rs b/src/test/ui/issues/issue-28676.rs
index 2b83478ca61..347a840296d 100644
--- a/src/test/ui/issues/issue-28676.rs
+++ b/src/test/ui/issues/issue-28676.rs
@@ -5,27 +5,32 @@
 // ignore-wasm32-bare no libc to test ffi with
 
 #[derive(Copy, Clone)]
-pub struct Quad { a: u64, b: u64, c: u64, d: u64 }
+pub struct Quad {
+    a: u64,
+    b: u64,
+    c: u64,
+    d: u64,
+}
 
 mod rustrt {
     use super::Quad;
 
     #[link(name = "rust_test_helpers", kind = "static")]
-    extern {
-        pub fn get_c_many_params(_: *const (), _: *const (),
-                                 _: *const (), _: *const (), f: Quad) -> u64;
+    extern "C" {
+        pub fn get_c_many_params(
+            _: *const (),
+            _: *const (),
+            _: *const (),
+            _: *const (),
+            f: Quad,
+        ) -> u64;
     }
 }
 
 fn test() {
     unsafe {
         let null = std::ptr::null();
-        let q = Quad {
-            a: 1,
-            b: 2,
-            c: 3,
-            d: 4
-        };
+        let q = Quad { a: 1, b: 2, c: 3, d: 4 };
         assert_eq!(rustrt::get_c_many_params(null, null, null, null, q), q.c);
     }
 }
diff --git a/src/test/ui/issues/issue-32201.rs b/src/test/ui/issues/issue-32201.rs
index e22c1604165..f27bb1c2eb5 100644
--- a/src/test/ui/issues/issue-32201.rs
+++ b/src/test/ui/issues/issue-32201.rs
@@ -1,4 +1,4 @@
-extern {
+extern "C" {
     fn foo(a: i32, ...);
 }
 
diff --git a/src/test/ui/issues/issue-3656.rs b/src/test/ui/issues/issue-3656.rs
index 17ff6b9f9f4..4a9f94306d5 100644
--- a/src/test/ui/issues/issue-3656.rs
+++ b/src/test/ui/issues/issue-3656.rs
@@ -1,14 +1,12 @@
 // run-pass
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
-
 // Issue #3656
 // Incorrect struct size computation in the FFI, because of not taking
 // the alignment of elements into account.
 
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test with
-
 #![feature(rustc_private)]
 
 extern crate libc;
@@ -21,10 +19,9 @@ pub struct KEYGEN {
     salt_size: u32,
 }
 
-extern {
+extern "C" {
     // Bogus signature, just need to test if it compiles.
     pub fn malloc(data: KEYGEN);
 }
 
-pub fn main() {
-}
+pub fn main() {}
diff --git a/src/test/ui/issues/issue-43925.rs b/src/test/ui/issues/issue-43925.rs
index 1f3bee38e8c..73d17928251 100644
--- a/src/test/ui/issues/issue-43925.rs
+++ b/src/test/ui/issues/issue-43925.rs
@@ -1,4 +1,4 @@
-#[link(name="foo", cfg("rlib"))] //~ ERROR invalid argument for `cfg(..)`
-extern {}
+#[link(name = "foo", cfg("rlib"))] //~ ERROR invalid argument for `cfg(..)`
+extern "C" {}
 
 fn main() {}
diff --git a/src/test/ui/issues/issue-43925.stderr b/src/test/ui/issues/issue-43925.stderr
index 739ace10aa6..7bf64dc693c 100644
--- a/src/test/ui/issues/issue-43925.stderr
+++ b/src/test/ui/issues/issue-43925.stderr
@@ -1,8 +1,8 @@
 error: invalid argument for `cfg(..)`
-  --> $DIR/issue-43925.rs:1:24
+  --> $DIR/issue-43925.rs:1:26
    |
-LL | #[link(name="foo", cfg("rlib"))]
-   |                        ^^^^^^
+LL | #[link(name = "foo", cfg("rlib"))]
+   |                          ^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-43926.rs b/src/test/ui/issues/issue-43926.rs
index c56a796187a..0171c12b1cc 100644
--- a/src/test/ui/issues/issue-43926.rs
+++ b/src/test/ui/issues/issue-43926.rs
@@ -1,4 +1,4 @@
-#[link(name="foo", cfg())] //~ ERROR `cfg()` must have an argument
-extern {}
+#[link(name = "foo", cfg())] //~ ERROR `cfg()` must have an argument
+extern "C" {}
 
 fn main() {}
diff --git a/src/test/ui/issues/issue-43926.stderr b/src/test/ui/issues/issue-43926.stderr
index d9d6b3a34fe..d83e9bd7ed4 100644
--- a/src/test/ui/issues/issue-43926.stderr
+++ b/src/test/ui/issues/issue-43926.stderr
@@ -1,8 +1,8 @@
 error: `cfg()` must have an argument
-  --> $DIR/issue-43926.rs:1:20
+  --> $DIR/issue-43926.rs:1:22
    |
-LL | #[link(name="foo", cfg())]
-   |                    ^^^^^
+LL | #[link(name = "foo", cfg())]
+   |                      ^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-5791.rs b/src/test/ui/issues/issue-5791.rs
index d9be27250cd..3544160f094 100644
--- a/src/test/ui/issues/issue-5791.rs
+++ b/src/test/ui/issues/issue-5791.rs
@@ -3,7 +3,7 @@
 #![warn(clashing_extern_declarations)]
 // pretty-expanded FIXME #23616
 
-extern {
+extern "C" {
     #[link_name = "malloc"]
     fn malloc1(len: i32) -> *const u8;
     #[link_name = "malloc"]
@@ -11,4 +11,4 @@ extern {
     fn malloc2(len: i32, foo: i32) -> *const u8;
 }
 
-pub fn main () {}
+pub fn main() {}
diff --git a/src/test/ui/issues/issue-6470.rs b/src/test/ui/issues/issue-6470.rs
index 0c86a648828..8c6192a59db 100644
--- a/src/test/ui/issues/issue-6470.rs
+++ b/src/test/ui/issues/issue-6470.rs
@@ -1,7 +1,6 @@
 // build-pass
 #![allow(dead_code)]
 #![allow(improper_ctypes)]
-
 // pretty-expanded FIXME #23616
 #![allow(non_snake_case)]
 
@@ -10,9 +9,9 @@ pub mod Bar {
         v: isize,
     }
 
-    extern {
+    extern "C" {
         pub fn foo(v: *const Foo) -> Foo;
     }
 }
 
-pub fn main() { }
+pub fn main() {}