Revert "attr: fix expected meta-item for #[stable]"

davidtwco · davidtwco · commit 9cdef5a36275 · 2022-07-29T13:48:04.000+01:00
This reverts commit a1d5af2.
diff --git a/compiler/rustc_attr/src/builtin.rs b/compiler/rustc_attr/src/builtin.rs
@@ -434,7 +434,7 @@ where
                                         meta.span(),
                                         AttrError::UnknownMetaItem(
                                             pprust::path_to_string(&mi.path),
-                                            &["feature", "since"],
+                                            &["since", "note"],
                                         ),
                                     );
                                     continue 'outer;
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr
@@ -8,7 +8,7 @@ error[E0541]: unknown meta item 'sinse'
   --> $DIR/stability-attribute-sanity-2.rs:10:25
    |
 LL | #[stable(feature = "a", sinse = "1.0.0")]
-   |                         ^^^^^^^^^^^^^^^ expected one of `feature`, `since`
+   |                         ^^^^^^^^^^^^^^^ expected one of `since`, `note`
 
 error[E0545]: `issue` must be a non-zero numeric string or "none"
   --> $DIR/stability-attribute-sanity-2.rs:13:27
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity.stderr
@@ -14,7 +14,7 @@ error[E0541]: unknown meta item 'reason'
   --> $DIR/stability-attribute-sanity.rs:8:42
    |
 LL |     #[stable(feature = "a", since = "b", reason)]
-   |                                          ^^^^^^ expected one of `feature`, `since`
+   |                                          ^^^^^^ expected one of `since`, `note`
 
 error[E0539]: incorrect meta item
   --> $DIR/stability-attribute-sanity.rs:11:29

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ error[E0541]: unknown meta item 'sinse'`
`8`	`8`	`--> $DIR/stability-attribute-sanity-2.rs:10:25`
`9`	`9`	`\|`
`10`	`10`	`LL \| #[stable(feature = "a", sinse = "1.0.0")]`
`11`		- \| ^^^^^^^^^^^^^^^ expected one of `feature`, `since`
	`11`	+ \| ^^^^^^^^^^^^^^^ expected one of `since`, `note`
`12`	`12`
`13`	`13`	error[E0545]: `issue` must be a non-zero numeric string or "none"
`14`	`14`	`--> $DIR/stability-attribute-sanity-2.rs:13:27`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ error[E0541]: unknown meta item 'reason'`
`14`	`14`	`--> $DIR/stability-attribute-sanity.rs:8:42`
`15`	`15`	`\|`
`16`	`16`	`LL \| #[stable(feature = "a", since = "b", reason)]`
`17`		- \| ^^^^^^ expected one of `feature`, `since`
	`17`	+ \| ^^^^^^ expected one of `since`, `note`
`18`	`18`
`19`	`19`	`error[E0539]: incorrect meta item`
`20`	`20`	`--> $DIR/stability-attribute-sanity.rs:11:29`