feat: show what lint was overruled

ShE3py · ShE3py · commit d12923346c44 · 2026-02-15T15:40:13.000+01:00
diff --git a/compiler/rustc_lint/src/errors.rs b/compiler/rustc_lint/src/errors.rs
@@ -20,7 +20,7 @@ pub(crate) struct OverruledAttribute<'a> {
 pub(crate) enum OverruledAttributeSub {
     DefaultSource { id: String },
     NodeSource { span: Span, reason: Option<Symbol> },
-    CommandLineSource,
+    CommandLineSource { id: Symbol },
 }
 
 impl Subdiagnostic for OverruledAttributeSub {
@@ -36,8 +36,9 @@ impl Subdiagnostic for OverruledAttributeSub {
                     diag.note(rationale.to_string());
                 }
             }
-            OverruledAttributeSub::CommandLineSource => {
-                diag.note(msg!("`forbid` lint level was set on command line"));
+            OverruledAttributeSub::CommandLineSource { id } => {
+                diag.note(msg!("`forbid` lint level was set on command line (`-F {$id}`)"));
+                diag.arg("id", id);
             }
         }
     }
diff --git a/compiler/rustc_lint/src/levels.rs b/compiler/rustc_lint/src/levels.rs
@@ -580,7 +580,9 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
                 LintLevelSource::Node { span, reason, .. } => {
                     OverruledAttributeSub::NodeSource { span, reason }
                 }
-                LintLevelSource::CommandLine(_, _) => OverruledAttributeSub::CommandLineSource,
+                LintLevelSource::CommandLine(name, _) => {
+                    OverruledAttributeSub::CommandLineSource { id: name }
+                }
             };
             if !fcw_warning {
                 self.sess.dcx().emit_err(OverruledAttribute {
diff --git a/tests/ui/lint/lint-forbid-attr.rs b/tests/ui/lint/lint-forbid-attr.rs
@@ -1,6 +1,7 @@
-#![forbid(deprecated)]
+#![forbid(deprecated)] //~ NOTE `forbid` level set here
 
 #[allow(deprecated)]
-//~^ ERROR allow(deprecated) incompatible
+//~^ ERROR allow(deprecated) incompatible with previous forbid [E0453]
+//~^^ NOTE overruled by previous forbid
 fn main() {
 }
diff --git a/tests/ui/lint/lint-forbid-cmdline-1.rs b/tests/ui/lint/lint-forbid-cmdline-1.rs
@@ -0,0 +1,5 @@
+//@ compile-flags: -F deprecated
+
+#[allow(deprecated)] //~ ERROR allow(deprecated) incompatible with previous forbid [E0453]
+fn main() {
+}
diff --git a/tests/ui/lint/lint-forbid-cmdline-1.stderr b/tests/ui/lint/lint-forbid-cmdline-1.stderr
@@ -1,10 +1,10 @@
 error[E0453]: allow(deprecated) incompatible with previous forbid
-  --> $DIR/lint-forbid-cmdline.rs:3:9
+  --> $DIR/lint-forbid-cmdline-1.rs:3:9
    |
 LL | #[allow(deprecated)]
    |         ^^^^^^^^^^ overruled by previous forbid
    |
-   = note: `forbid` lint level was set on command line
+   = note: `forbid` lint level was set on command line (`-F deprecated`)
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/lint/lint-forbid-cmdline-2.rs b/tests/ui/lint/lint-forbid-cmdline-2.rs
@@ -0,0 +1,8 @@
+//@ compile-flags: -F dead_code
+
+#[allow(unused)]
+//~^ ERROR allow(unused) incompatible with previous forbid [E0453]
+//~| NOTE overruled by previous forbid
+//~| NOTE `forbid` lint level was set on command line (`-F dead_code`)
+fn main() {
+}
diff --git a/tests/ui/lint/lint-forbid-cmdline-2.stderr b/tests/ui/lint/lint-forbid-cmdline-2.stderr
@@ -0,0 +1,11 @@
+error[E0453]: allow(unused) incompatible with previous forbid
+  --> $DIR/lint-forbid-cmdline-2.rs:3:9
+   |
+LL | #[allow(unused)]
+   |         ^^^^^^ overruled by previous forbid
+   |
+   = note: `forbid` lint level was set on command line (`-F dead_code`)
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0453`.
diff --git a/tests/ui/lint/lint-forbid-cmdline.rs b/tests/ui/lint/lint-forbid-cmdline.rs

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ pub(crate) struct OverruledAttribute<'a> {`
`20`	`20`	`pub(crate) enum OverruledAttributeSub {`
`21`	`21`	`DefaultSource { id: String },`
`22`	`22`	`NodeSource { span: Span, reason: Option<Symbol> },`
`23`		`- CommandLineSource,`
	`23`	`+ CommandLineSource { id: Symbol },`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`impl Subdiagnostic for OverruledAttributeSub {`
`@@ -36,8 +36,9 @@ impl Subdiagnostic for OverruledAttributeSub {`
`36`	`36`	`diag.note(rationale.to_string());`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`- OverruledAttributeSub::CommandLineSource => {`
`40`		- diag.note(msg!("`forbid` lint level was set on command line"));
	`39`	`+ OverruledAttributeSub::CommandLineSource { id } => {`
	`40`	+ diag.note(msg!("`forbid` lint level was set on command line (`-F {$id}`)"));
	`41`	`+ diag.arg("id", id);`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-#![forbid(deprecated)]`
	`1`	+#![forbid(deprecated)] //~ NOTE `forbid` level set here
`2`	`2`
`3`	`3`	`#[allow(deprecated)]`
`4`		`-//~^ ERROR allow(deprecated) incompatible`
	`4`	`+//~^ ERROR allow(deprecated) incompatible with previous forbid [E0453]`
	`5`	`+//~^^ NOTE overruled by previous forbid`
`5`	`6`	`fn main() {`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`error[E0453]: allow(deprecated) incompatible with previous forbid`
`2`		`- --> $DIR/lint-forbid-cmdline.rs:3:9`
	`2`	`+ --> $DIR/lint-forbid-cmdline-1.rs:3:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[allow(deprecated)]`
`5`	`5`	`\| ^^^^^^^^^^ overruled by previous forbid`
`6`	`6`	`\|`
`7`		- = note: `forbid` lint level was set on command line
	`7`	+ = note: `forbid` lint level was set on command line (`-F deprecated`)
`8`	`8`
`9`	`9`	`error: aborting due to 1 previous error`
`10`	`10`