Mark missing_abi lint as an edition migration lint

obeis · obeis · commit e3867bd7a21f · 2025-03-09T17:33:13.000+03:00
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
@@ -3544,9 +3544,15 @@ declare_lint! {
     /// easily makes code review easier.
     ///
     /// [Other ABIs]: https://doc.rust-lang.org/reference/items/external-blocks.html#abi
+    /// [issue #134986]: https://github.com/rust-lang/rust/issues/134986
+    /// [`cargo fix`]: https://doc.rust-lang.org/cargo/commands/cargo-fix.html
     pub MISSING_ABI,
     Warn,
-    "No declared ABI for extern declaration"
+    "No declared ABI for extern declaration",
+    @future_incompatible = FutureIncompatibleInfo {
+        reason: FutureIncompatibilityReason::EditionError(Edition::EditionFuture),
+        reference: "issue #134986 <https://github.com/rust-lang/rust/issues/134986>",
+    };
 }
 
 declare_lint! {
diff --git a/src/tools/lint-docs/src/groups.rs b/src/tools/lint-docs/src/groups.rs
@@ -26,6 +26,7 @@ static GROUP_DESCRIPTIONS: &[(&str, &str)] = &[
         "Lints that detect identifiers which will be come keywords in later editions",
     ),
     ("deprecated-safe", "Lints for functions which were erroneously marked as safe in the past"),
+    ("missing_abi", "Lint detects cases where the ABI is omitted from `extern` declarations"),
 ];
 
 type LintGroups = BTreeMap<String, BTreeSet<String>>;
diff --git a/tests/ui/feature-gates/feature-gate-explicit-extern-abis.fixed b/tests/ui/feature-gates/feature-gate-explicit-extern-abis.fixed
@@ -0,0 +1,8 @@
+//@ run-pass
+//@ run-rustfix
+
+extern "C" fn _foo() {}
+//~^ WARN extern declarations without an explicit ABI are deprecated
+//~^^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+
+fn main() {}
diff --git a/tests/ui/feature-gates/feature-gate-explicit-extern-abis.rs b/tests/ui/feature-gates/feature-gate-explicit-extern-abis.rs
@@ -1,6 +1,8 @@
 //@ run-pass
+//@ run-rustfix
 
 extern fn _foo() {}
 //~^ WARN extern declarations without an explicit ABI are deprecated
+//~^^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
 
 fn main() {}
diff --git a/tests/ui/feature-gates/feature-gate-explicit-extern-abis.stderr b/tests/ui/feature-gates/feature-gate-explicit-extern-abis.stderr
@@ -1,9 +1,11 @@
 warning: extern declarations without an explicit ABI are deprecated
-  --> $DIR/feature-gate-explicit-extern-abis.rs:3:1
+  --> $DIR/feature-gate-explicit-extern-abis.rs:4:1
    |
 LL | extern fn _foo() {}
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: `#[warn(missing_abi)]` on by default
 
 warning: 1 warning emitted
diff --git a/tests/ui/link-native-libs/suggest-libname-only-1.stderr b/tests/ui/link-native-libs/suggest-libname-only-1.stderr
@@ -4,6 +4,8 @@ warning: extern declarations without an explicit ABI are deprecated
 LL | extern { }
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: `#[warn(missing_abi)]` on by default
 
 error: could not find native static library `libfoo.a`, perhaps an -L flag is missing?
diff --git a/tests/ui/link-native-libs/suggest-libname-only-2.stderr b/tests/ui/link-native-libs/suggest-libname-only-2.stderr
@@ -4,6 +4,8 @@ warning: extern declarations without an explicit ABI are deprecated
 LL | extern { }
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: `#[warn(missing_abi)]` on by default
 
 error: could not find native static library `bar.lib`, perhaps an -L flag is missing?
diff --git a/tests/ui/lint/cli-lint-override.forbid_warn.stderr b/tests/ui/lint/cli-lint-override.forbid_warn.stderr
@@ -1,9 +1,11 @@
 error: extern declarations without an explicit ABI are deprecated
-  --> $DIR/cli-lint-override.rs:12:1
+  --> $DIR/cli-lint-override.rs:11:1
    |
 LL | extern fn foo() {}
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: requested on the command line with `-F missing-abi`
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/lint/cli-lint-override.force_warn_deny.stderr b/tests/ui/lint/cli-lint-override.force_warn_deny.stderr
@@ -1,9 +1,11 @@
 warning: extern declarations without an explicit ABI are deprecated
-  --> $DIR/cli-lint-override.rs:12:1
+  --> $DIR/cli-lint-override.rs:11:1
    |
 LL | extern fn foo() {}
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: requested on the command line with `--force-warn missing-abi`
 
 warning: 1 warning emitted
diff --git a/tests/ui/lint/cli-lint-override.rs b/tests/ui/lint/cli-lint-override.rs
@@ -8,10 +8,12 @@
 //@[force_warn_deny] compile-flags: --force-warn missing_abi --allow missing_abi
 //@[force_warn_deny] check-pass
 
-
 extern fn foo() {}
 //[warn_deny]~^ ERROR extern declarations without an explicit ABI are deprecated
-//[forbid_warn]~^^ ERROR extern declarations without an explicit ABI are deprecated
-//[force_warn_deny]~^^^ WARN extern declarations without an explicit ABI are deprecated
+//[warn_deny]~^^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+//[forbid_warn]~^^^ ERROR extern declarations without an explicit ABI are deprecated
+//[forbid_warn]~^^^^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+//[force_warn_deny]~^^^^^ WARN extern declarations without an explicit ABI are deprecated
+//[force_warn_deny]~^^^^^^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
 
 fn main() {}
diff --git a/tests/ui/lint/cli-lint-override.warn_deny.stderr b/tests/ui/lint/cli-lint-override.warn_deny.stderr
@@ -1,9 +1,11 @@
 error: extern declarations without an explicit ABI are deprecated
-  --> $DIR/cli-lint-override.rs:12:1
+  --> $DIR/cli-lint-override.rs:11:1
    |
 LL | extern fn foo() {}
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: requested on the command line with `-D missing-abi`
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/parser/bad-lit-suffixes.rs b/tests/ui/parser/bad-lit-suffixes.rs
@@ -1,10 +1,12 @@
 #![feature(rustc_attrs)]
 
 extern //~ WARN missing_abi
+       //~^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
     "C"suffix //~ ERROR suffixes on string literals are invalid
     fn foo() {}
 
 extern //~ WARN missing_abi
+       //~^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
     "C"suffix //~ ERROR suffixes on string literals are invalid
 {}
 
diff --git a/tests/ui/parser/bad-lit-suffixes.stderr b/tests/ui/parser/bad-lit-suffixes.stderr
@@ -1,29 +1,29 @@
 error: suffixes on string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:4:5
+  --> $DIR/bad-lit-suffixes.rs:5:5
    |
 LL |     "C"suffix
    |     ^^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:8:5
+  --> $DIR/bad-lit-suffixes.rs:10:5
    |
 LL |     "C"suffix
    |     ^^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:30:17
+  --> $DIR/bad-lit-suffixes.rs:32:17
    |
 LL | #[rustc_dummy = "string"suffix]
    |                 ^^^^^^^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:34:14
+  --> $DIR/bad-lit-suffixes.rs:36:14
    |
 LL | #[must_use = "string"suffix]
    |              ^^^^^^^^^^^^^^ invalid suffix `suffix`
 
 error: malformed `must_use` attribute input
-  --> $DIR/bad-lit-suffixes.rs:34:1
+  --> $DIR/bad-lit-suffixes.rs:36:1
    |
 LL | #[must_use = "string"suffix]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -38,13 +38,13 @@ LL + #[must_use]
    |
 
 error: suffixes on string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:39:15
+  --> $DIR/bad-lit-suffixes.rs:41:15
    |
 LL | #[link(name = "string"suffix)]
    |               ^^^^^^^^^^^^^^ invalid suffix `suffix`
 
 error: invalid suffix `suffix` for number literal
-  --> $DIR/bad-lit-suffixes.rs:43:41
+  --> $DIR/bad-lit-suffixes.rs:45:41
    |
 LL | #[rustc_layout_scalar_valid_range_start(0suffix)]
    |                                         ^^^^^^^ invalid suffix `suffix`
@@ -57,108 +57,113 @@ warning: extern declarations without an explicit ABI are deprecated
 LL | extern
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: `#[warn(missing_abi)]` on by default
 
 warning: extern declarations without an explicit ABI are deprecated
-  --> $DIR/bad-lit-suffixes.rs:7:1
+  --> $DIR/bad-lit-suffixes.rs:8:1
    |
 LL | extern
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
+   |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
 
 error: suffixes on string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:12:5
+  --> $DIR/bad-lit-suffixes.rs:14:5
    |
 LL |     ""suffix;
    |     ^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on byte string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:13:5
+  --> $DIR/bad-lit-suffixes.rs:15:5
    |
 LL |     b""suffix;
    |     ^^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:14:5
+  --> $DIR/bad-lit-suffixes.rs:16:5
    |
 LL |     r#""#suffix;
    |     ^^^^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on byte string literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:15:5
+  --> $DIR/bad-lit-suffixes.rs:17:5
    |
 LL |     br#""#suffix;
    |     ^^^^^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on char literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:16:5
+  --> $DIR/bad-lit-suffixes.rs:18:5
    |
 LL |     'a'suffix;
    |     ^^^^^^^^^ invalid suffix `suffix`
 
 error: suffixes on byte literals are invalid
-  --> $DIR/bad-lit-suffixes.rs:17:5
+  --> $DIR/bad-lit-suffixes.rs:19:5
    |
 LL |     b'a'suffix;
    |     ^^^^^^^^^^ invalid suffix `suffix`
 
 error: invalid width `1024` for integer literal
-  --> $DIR/bad-lit-suffixes.rs:19:5
+  --> $DIR/bad-lit-suffixes.rs:21:5
    |
 LL |     1234u1024;
    |     ^^^^^^^^^
    |
    = help: valid widths are 8, 16, 32, 64 and 128
 
 error: invalid width `1024` for integer literal
-  --> $DIR/bad-lit-suffixes.rs:20:5
+  --> $DIR/bad-lit-suffixes.rs:22:5
    |
 LL |     1234i1024;
    |     ^^^^^^^^^
    |
    = help: valid widths are 8, 16, 32, 64 and 128
 
 error: invalid width `1024` for float literal
-  --> $DIR/bad-lit-suffixes.rs:21:5
+  --> $DIR/bad-lit-suffixes.rs:23:5
    |
 LL |     1234f1024;
    |     ^^^^^^^^^
    |
    = help: valid widths are 32 and 64
 
 error: invalid width `1024` for float literal
-  --> $DIR/bad-lit-suffixes.rs:22:5
+  --> $DIR/bad-lit-suffixes.rs:24:5
    |
 LL |     1234.5f1024;
    |     ^^^^^^^^^^^
    |
    = help: valid widths are 32 and 64
 
 error: invalid suffix `suffix` for number literal
-  --> $DIR/bad-lit-suffixes.rs:24:5
+  --> $DIR/bad-lit-suffixes.rs:26:5
    |
 LL |     1234suffix;
    |     ^^^^^^^^^^ invalid suffix `suffix`
    |
    = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
 
 error: invalid suffix `suffix` for number literal
-  --> $DIR/bad-lit-suffixes.rs:25:5
+  --> $DIR/bad-lit-suffixes.rs:27:5
    |
 LL |     0b101suffix;
    |     ^^^^^^^^^^^ invalid suffix `suffix`
    |
    = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)
 
 error: invalid suffix `suffix` for float literal
-  --> $DIR/bad-lit-suffixes.rs:26:5
+  --> $DIR/bad-lit-suffixes.rs:28:5
    |
 LL |     1.0suffix;
    |     ^^^^^^^^^ invalid suffix `suffix`
    |
    = help: valid suffixes are `f32` and `f64`
 
 error: invalid suffix `suffix` for float literal
-  --> $DIR/bad-lit-suffixes.rs:27:5
+  --> $DIR/bad-lit-suffixes.rs:29:5
    |
 LL |     1.0e10suffix;
    |     ^^^^^^^^^^^^ invalid suffix `suffix`
diff --git a/tests/ui/parser/lit-err-in-macro.rs b/tests/ui/parser/lit-err-in-macro.rs
@@ -1,6 +1,7 @@
 macro_rules! f {
     ($abi:literal) => {
         extern $abi fn f() {} //~ WARN missing_abi
+        //~^ WARN this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
     }
 }
 
diff --git a/tests/ui/parser/lit-err-in-macro.stderr b/tests/ui/parser/lit-err-in-macro.stderr
@@ -1,5 +1,5 @@
 error: suffixes on string literals are invalid
-  --> $DIR/lit-err-in-macro.rs:7:4
+  --> $DIR/lit-err-in-macro.rs:8:4
    |
 LL | f!("Foo"__);
    |    ^^^^^^^ invalid suffix `__`
@@ -13,6 +13,8 @@ LL |         extern $abi fn f() {}
 LL | f!("Foo"__);
    | ----------- in this macro invocation
    |
+   = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: `#[warn(missing_abi)]` on by default
    = note: this warning originates in the macro `f` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/proc-macro/inner-attrs.stderr b/tests/ui/proc-macro/inner-attrs.stderr
@@ -28,6 +28,8 @@ warning: extern declarations without an explicit ABI are deprecated
 LL | extern {
    | ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
    |
+   = warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust future!
+   = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>
    = note: `#[warn(missing_abi)]` on by default
 
 error: aborting due to 4 previous errors; 1 warning emitted

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`warning: extern declarations without an explicit ABI are deprecated`
`2`		`- --> $DIR/feature-gate-explicit-extern-abis.rs:3:1`
	`2`	`+ --> $DIR/feature-gate-explicit-extern-abis.rs:4:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| extern fn _foo() {}`
`5`	`5`	\| ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
`6`	`6`	`\|`
	`7`	`+ = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!`
	`8`	`+ = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>`
`7`	`9`	= note: `#[warn(missing_abi)]` on by default
`8`	`10`
`9`	`11`	`warning: 1 warning emitted`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ warning: extern declarations without an explicit ABI are deprecated`
`4`	`4`	`LL \| extern { }`
`5`	`5`	\| ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
`6`	`6`	`\|`
	`7`	`+ = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!`
	`8`	`+ = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>`
`7`	`9`	= note: `#[warn(missing_abi)]` on by default
`8`	`10`
`9`	`11`	error: could not find native static library `libfoo.a`, perhaps an -L flag is missing?
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`error: extern declarations without an explicit ABI are deprecated`
`2`		`- --> $DIR/cli-lint-override.rs:12:1`
	`2`	`+ --> $DIR/cli-lint-override.rs:11:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| extern fn foo() {}`
`5`	`5`	\| ^^^^^^ help: explicitly specify the "C" ABI: `extern "C"`
`6`	`6`	`\|`
	`7`	`+ = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust future!`
	`8`	`+ = note: for more information, see issue #134986 <https://github.com/rust-lang/rust/issues/134986>`
`7`	`9`	= note: requested on the command line with `-F missing-abi`
`8`	`10`
`9`	`11`	`error: aborting due to 1 previous error`