Rollup merge of rust-lang#94213 - digama0:patch-4, r=Dylan-DPC

matthiaskrgr · web-flow · commit 14ac74d43893 · 2022-02-23T12:26:41.000+01:00
fix names in feature(...) suggestion
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs
@@ -453,7 +453,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
     // Internal attributes: Stability, deprecation, and unsafe:
     // ==========================================================================
 
-    ungated!(feature, CrateLevel, template!(List: "name1, name1, ..."), DuplicatesOk),
+    ungated!(feature, CrateLevel, template!(List: "name1, name2, ..."), DuplicatesOk),
     // DuplicatesOk since it has its own validation
     ungated!(
         rustc_deprecated, Normal,
diff --git a/src/test/ui/feature-gates/gated-bad-feature.stderr b/src/test/ui/feature-gates/gated-bad-feature.stderr
@@ -20,13 +20,13 @@ error: malformed `feature` attribute input
   --> $DIR/gated-bad-feature.rs:5:1
    |
 LL | #![feature]
-   | ^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name1, ...)]`
+   | ^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]`
 
 error: malformed `feature` attribute input
   --> $DIR/gated-bad-feature.rs:6:1
    |
 LL | #![feature = "foo"]
-   | ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name1, ...)]`
+   | ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]`
 
 error: aborting due to 5 previous errors
 

Original file line number	Diff line number	Diff line change
@@ -20,13 +20,13 @@ error: malformed `feature` attribute input
`20`	`20`	`--> $DIR/gated-bad-feature.rs:5:1`
`21`	`21`	`\|`
`22`	`22`	`LL \| #![feature]`
`23`		- \| ^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name1, ...)]`
	`23`	+ \| ^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]`
`24`	`24`
`25`	`25`	error: malformed `feature` attribute input
`26`	`26`	`--> $DIR/gated-bad-feature.rs:6:1`
`27`	`27`	`\|`
`28`	`28`	`LL \| #![feature = "foo"]`
`29`		- \| ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name1, ...)]`
	`29`	+ \| ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]`
`30`	`30`
`31`	`31`	`error: aborting due to 5 previous errors`
`32`	`32`