Remove help message for stability attributes

JonathanBrouwer · JonathanBrouwer · commit 47acd7a71919 · 2026-06-01T21:06:04.000+02:00
diff --git a/compiler/rustc_attr_parsing/src/stability.rs b/compiler/rustc_attr_parsing/src/stability.rs
@@ -58,6 +58,13 @@ impl<'sess> AttributeParser<'sess> {
 
         let mut diag = feature_err(self.sess, gate_name, attr_span, explain);
 
+        // Remove the suggestion for `#![feature(staged_api)]` as these attributes are currently
+        // not usable outside std. If we do ever expose `#[stable]` etc under a different feature
+        // name then it would be unfortunate to have nightlies out there suggesting `staged_api`.
+        if gate_name == sym::staged_api {
+            diag.children.clear();
+        }
+
         for note in default_notes {
             diag.note(note.clone());
         }
diff --git a/tests/ui/attributes/unstable_removed.stderr b/tests/ui/attributes/unstable_removed.stderr
@@ -9,9 +9,6 @@ LL | |     link = "https://github.com/rust-lang/rust/issues/141617",
 LL | |     since="1.92.0"
 LL | | )]
    | |__^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0557]: feature `old_feature` has been removed
   --> $DIR/unstable_removed.rs:3:12
diff --git a/tests/ui/feature-gates/feature-gate-rustc_const_unstable.stderr b/tests/ui/feature-gates/feature-gate-rustc_const_unstable.stderr
@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[rustc_const_unstable(feature="fzzzzzt")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0547]: missing 'issue'
   --> $DIR/feature-gate-rustc_const_unstable.rs:3:1
diff --git a/tests/ui/feature-gates/feature-gate-staged_api.stderr b/tests/ui/feature-gates/feature-gate-staged_api.stderr
@@ -3,18 +3,12 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #![stable(feature = "a", since = "3.3.3")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: stability attributes may not be used outside of the standard library
   --> $DIR/feature-gate-staged_api.rs:8:1
    |
 LL | #[stable(feature = "a", since = "3.3.3")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-stable.stderr b/tests/ui/feature-gates/issue-43106-gating-of-stable.stderr
@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #![stable()]
    | ^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-stable.rs:7:1
@@ -24,9 +21,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[stable()]
    | ^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-stable.rs:12:1
@@ -45,9 +39,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |         #![stable()]
    |         ^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-stable.rs:18:9
@@ -66,9 +57,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[stable()]
    |     ^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-stable.rs:24:5
@@ -87,9 +75,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[stable()]
    |     ^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-stable.rs:30:5
@@ -108,9 +93,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[stable()]
    |     ^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-stable.rs:36:5
@@ -129,9 +111,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[stable()]
    |     ^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-stable.rs:42:5
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-unstable.stderr b/tests/ui/feature-gates/issue-43106-gating-of-unstable.stderr
@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #![unstable()]
    | ^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-unstable.rs:7:1
@@ -24,9 +21,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[unstable()]
    | ^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-unstable.rs:12:1
@@ -45,9 +39,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |         #![unstable()]
    |         ^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-unstable.rs:18:9
@@ -66,9 +57,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[unstable()]
    |     ^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-unstable.rs:24:5
@@ -87,9 +75,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[unstable()]
    |     ^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-unstable.rs:30:5
@@ -108,9 +93,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[unstable()]
    |     ^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-unstable.rs:36:5
@@ -129,9 +111,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL |     #[unstable()]
    |     ^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/issue-43106-gating-of-unstable.rs:42:5
diff --git a/tests/ui/stability-attribute/issue-106589.stderr b/tests/ui/stability-attribute/issue-106589.stderr
@@ -3,18 +3,12 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #![stable(feature = "foo", since = "1.0.0")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: stability attributes may not be used outside of the standard library
   --> $DIR/issue-106589.rs:6:1
    |
 LL | #[unstable(feature = "foo", issue = "none")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr b/tests/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr
@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[unstable()]
    | ^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/stability-attribute-non-staged-force-unstable.rs:3:1
@@ -24,9 +21,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[stable()]
    | ^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/stability-attribute-non-staged-force-unstable.rs:7:1
diff --git a/tests/ui/stability-attribute/stability-attribute-non-staged.stderr b/tests/ui/stability-attribute/stability-attribute-non-staged.stderr
@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[unstable()]
    | ^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/stability-attribute-non-staged.rs:1:1
@@ -24,9 +21,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[stable()]
    | ^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0546]: missing 'feature'
   --> $DIR/stability-attribute-non-staged.rs:5:1
diff --git a/tests/ui/unstable-feature-bound/unstable_feature_bound_staged_api.stderr b/tests/ui/unstable-feature-bound/unstable_feature_bound_staged_api.stderr
@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra
    |
 LL | #[unstable_feature_bound(feat_bar)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = help: add `#![feature(staged_api)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error: aborting due to 1 previous error
 

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[rustc_const_unstable(feature="fzzzzzt")]`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`6`		`- \|`
`7`		- = help: add `#![feature(staged_api)]` to the crate attributes to enable
`8`		`- = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`9`	`6`
`10`	`7`	`error[E0547]: missing 'issue'`
`11`	`8`	`--> $DIR/feature-gate-rustc_const_unstable.rs:3:1`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ error[E0658]: stability attributes may not be used outside of the standard libra`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[unstable_feature_bound(feat_bar)]`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`6`		`- \|`
`7`		- = help: add `#![feature(staged_api)]` to the crate attributes to enable
`8`		`- = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`9`	`6`
`10`	`7`	`error: aborting due to 1 previous error`
`11`	`8`