Merge pull request rust-lang#7 from J-ZhengLi/dev_stable

surechen · web-flow · commit af6c9d4cc17b · 2023-06-26T10:54:08.000+08:00
fix test fail after dev fmt of [`implicit_abi`]
diff --git a/tests/ui/implicit_abi.fixed b/tests/ui/implicit_abi.fixed
@@ -7,6 +7,7 @@ use std::ffi::{c_char, c_void};
 #[repr(C)]
 pub struct External(i8);
 
+#[rustfmt::skip]
 extern "C" {
     fn foo();
     fn bar(a: u8, b: i32) -> u64;
diff --git a/tests/ui/implicit_abi.rs b/tests/ui/implicit_abi.rs
@@ -7,6 +7,7 @@ use std::ffi::{c_char, c_void};
 #[repr(C)]
 pub struct External(i8);
 
+#[rustfmt::skip]
 extern {
     fn foo();
     fn bar(a: u8, b: i32) -> u64;
diff --git a/tests/ui/implicit_abi.stderr b/tests/ui/implicit_abi.stderr
@@ -1,19 +1,19 @@
 error: missing ABI label on extern block
-  --> $DIR/implicit_abi.rs:10:1
+  --> $DIR/implicit_abi.rs:11:1
    |
 LL | extern {
    | ^^^^^^ help: explicitly states ABI instead: `extern "C"`
    |
    = note: `-D clippy::implicit-abi` implied by `-D warnings`
 
 error: missing ABI label on extern block
-  --> $DIR/implicit_abi.rs:22:1
+  --> $DIR/implicit_abi.rs:23:1
    |
 LL | extern
    | ^^^^^^ help: explicitly states ABI instead: `extern "C"`
 
 error: missing ABI label on extern block
-  --> $DIR/implicit_abi.rs:28:1
+  --> $DIR/implicit_abi.rs:29:1
    |
 LL | extern { fn my_c_fn(a: i8) -> c_void; }
    | ^^^^^^ help: explicitly states ABI instead: `extern "C"`

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`error: missing ABI label on extern block`
`2`		`- --> $DIR/implicit_abi.rs:10:1`
	`2`	`+ --> $DIR/implicit_abi.rs:11:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| extern {`
`5`	`5`	\| ^^^^^^ help: explicitly states ABI instead: `extern "C"`
`6`	`6`	`\|`
`7`	`7`	= note: `-D clippy::implicit-abi` implied by `-D warnings`
`8`	`8`
`9`	`9`	`error: missing ABI label on extern block`
`10`		`- --> $DIR/implicit_abi.rs:22:1`
	`10`	`+ --> $DIR/implicit_abi.rs:23:1`
`11`	`11`	`\|`
`12`	`12`	`LL \| extern`
`13`	`13`	\| ^^^^^^ help: explicitly states ABI instead: `extern "C"`
`14`	`14`
`15`	`15`	`error: missing ABI label on extern block`
`16`		`- --> $DIR/implicit_abi.rs:28:1`
	`16`	`+ --> $DIR/implicit_abi.rs:29:1`
`17`	`17`	`\|`
`18`	`18`	`LL \| extern { fn my_c_fn(a: i8) -> c_void; }`
`19`	`19`	\| ^^^^^^ help: explicitly states ABI instead: `extern "C"`