Update uitests

JonathanBrouwer · JonathanBrouwer · commit 0b5290123d66 · 2026-02-22T20:20:33.000+01:00
diff --git a/tests/pretty/delegation-inherit-attributes.pp b/tests/pretty/delegation-inherit-attributes.pp
@@ -5,7 +5,7 @@
 //@ pp-exact:delegation-inherit-attributes.pp
 
 #![allow(incomplete_features)]
-#![feature(fn_delegation)]
+#![attr = Feature([fn_delegation#0])]
 extern crate std;
 #[attr = PreludeImport]
 use std::prelude::rust_2021::*;
diff --git a/tests/pretty/delegation-inline-attribute.pp b/tests/pretty/delegation-inline-attribute.pp
@@ -3,7 +3,7 @@
 //@ pp-exact:delegation-inline-attribute.pp
 
 #![allow(incomplete_features)]
-#![feature(fn_delegation)]
+#![attr = Feature([fn_delegation#0])]
 extern crate std;
 #[attr = PreludeImport]
 use ::std::prelude::rust_2015::*;
diff --git a/tests/pretty/hir-delegation.pp b/tests/pretty/hir-delegation.pp
@@ -3,7 +3,7 @@
 //@ pp-exact:hir-delegation.pp
 
 #![allow(incomplete_features)]
-#![feature(fn_delegation)]
+#![attr = Feature([fn_delegation#0])]
 extern crate std;
 #[attr = PreludeImport]
 use ::std::prelude::rust_2015::*;
diff --git a/tests/pretty/hir-fn-variadic.pp b/tests/pretty/hir-fn-variadic.pp
@@ -1,11 +1,11 @@
+#![attr = Feature([c_variadic#0])]
+extern crate std;
+#[attr = PreludeImport]
+use ::std::prelude::rust_2015::*;
 //@ pretty-compare-only
 //@ pretty-mode:hir
 //@ pp-exact:hir-fn-variadic.pp
 
-#![feature(c_variadic)]
-extern crate std;
-#[attr = PreludeImport]
-use ::std::prelude::rust_2015::*;
 
 extern "C" {
     unsafe fn foo(x: i32, va1: ...);
diff --git a/tests/pretty/pin-ergonomics-hir.pp b/tests/pretty/pin-ergonomics-hir.pp
@@ -2,8 +2,8 @@
 //@ pretty-mode:hir
 //@ pp-exact:pin-ergonomics-hir.pp
 
-#![feature(pin_ergonomics)]
 #![allow(dead_code, incomplete_features)]
+#![attr = Feature([pin_ergonomics#0])]
 extern crate std;
 #[attr = PreludeImport]
 use ::std::prelude::rust_2015::*;
diff --git a/tests/ui/attributes/attr-mix-new.rs b/tests/ui/attributes/attr-mix-new.rs
@@ -5,7 +5,7 @@
 #[rustc_dummy(bar)]
 mod foo {
   #![feature(globs)]
-  //~^ WARN crate-level attribute should be in the root module
+  //~^ WARN the `#![feature]` attribute can only be used at the crate root
 }
 
 fn main() {}
diff --git a/tests/ui/attributes/attr-mix-new.stderr b/tests/ui/attributes/attr-mix-new.stderr
@@ -1,4 +1,4 @@
-warning: crate-level attribute should be in the root module
+warning: the `#![feature]` attribute can only be used at the crate root
   --> $DIR/attr-mix-new.rs:7:3
    |
 LL |   #![feature(globs)]
diff --git a/tests/ui/consts/const-block-items/hir.stdout b/tests/ui/consts/const-block-items/hir.stdout
@@ -1,10 +1,10 @@
-//@ build-pass
-//@ compile-flags: -Zunpretty=hir
-
-#![feature(const_block_items)]
+#![attr = Feature([const_block_items#0])]
 extern crate std;
 #[attr = PreludeImport]
 use ::std::prelude::rust_2015::*;
+//@ build-pass
+//@ compile-flags: -Zunpretty=hir
+
 
 const _: () =
     {
diff --git a/tests/ui/empty/empty-attributes.stderr b/tests/ui/empty/empty-attributes.stderr
@@ -43,14 +43,6 @@ LL | #![forbid()]
    |
    = note: attribute `forbid` with an empty list has no effect
 
-error: unused attribute
-  --> $DIR/empty-attributes.rs:7:1
-   |
-LL | #![feature()]
-   | ^^^^^^^^^^^^^ help: remove this attribute
-   |
-   = note: attribute `feature` with an empty list has no effect
-
 error: unused attribute
   --> $DIR/empty-attributes.rs:9:1
    |
@@ -67,5 +59,13 @@ LL | #[target_feature()]
    |
    = note: using `target_feature` with an empty list has no effect
 
+error: unused attribute
+  --> $DIR/empty-attributes.rs:7:1
+   |
+LL | #![feature()]
+   | ^^^^^^^^^^^^^ help: remove this attribute
+   |
+   = note: using `feature` with an empty list has no effect
+
 error: aborting due to 8 previous errors
 
diff --git a/tests/ui/feature-gates/feature-gate-feature-gate.rs b/tests/ui/feature-gates/feature-gate-feature-gate.rs
@@ -1,4 +1,4 @@
 #![forbid(unstable_features)]
 #![feature(intrinsics)] //~ ERROR unstable feature
 
-fn main() { }
+fn main() {}
diff --git a/tests/ui/feature-gates/gated-bad-feature.stderr b/tests/ui/feature-gates/gated-bad-feature.stderr
@@ -1,15 +1,3 @@
-error[E0556]: malformed `feature` attribute input
-  --> $DIR/gated-bad-feature.rs:1:25
-   |
-LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
-   |                         ^^^^^^^^ help: expected just one word: `foo`
-
-error[E0556]: malformed `feature` attribute input
-  --> $DIR/gated-bad-feature.rs:1:35
-   |
-LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
-   |                                   ^^^^^^^^^^^ help: expected just one word: `foo`
-
 error[E0557]: feature has been removed
   --> $DIR/gated-bad-feature.rs:8:12
    |
@@ -18,17 +6,41 @@ LL | #![feature(test_removed_feature)]
    |
    = note: removed in 1.0.0
 
-error: malformed `feature` attribute input
+error[E0565]: malformed `feature` attribute input
+  --> $DIR/gated-bad-feature.rs:1:1
+   |
+LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^-----^^^^^^^^^^^^^^^^^^^^
+   | |                          |
+   | |                          didn't expect any arguments here
+   | help: must be of the form: `#![feature(feature1, feature2, ...)]`
+
+error[E0565]: malformed `feature` attribute input
+  --> $DIR/gated-bad-feature.rs:1:1
+   |
+LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------^^^^^^^
+   | |                                     |
+   | |                                     didn't expect any arguments here
+   | help: must be of the form: `#![feature(feature1, feature2, ...)]`
+
+error[E0539]: malformed `feature` attribute input
   --> $DIR/gated-bad-feature.rs:6:1
    |
 LL | #![feature]
-   | ^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]`
+   | ^^^^^^^^^^^
+   | |
+   | expected this to be a list
+   | help: must be of the form: `#![feature(feature1, feature2, ...)]`
 
-error: malformed `feature` attribute input
+error[E0539]: malformed `feature` attribute input
   --> $DIR/gated-bad-feature.rs:7:1
    |
 LL | #![feature = "foo"]
-   | ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]`
+   | ^^^^^^^^^^^-------^
+   | |          |
+   | |          expected this to be a list
+   | help: must be of the form: `#![feature(feature1, feature2, ...)]`
 
 error[E0635]: unknown feature `foo_bar_baz`
   --> $DIR/gated-bad-feature.rs:1:12
@@ -44,5 +56,5 @@ LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)]
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0556, E0557, E0635.
-For more information about an error, try `rustc --explain E0556`.
+Some errors have detailed explanations: E0539, E0557, E0565, E0635.
+For more information about an error, try `rustc --explain E0539`.
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
@@ -859,26 +859,26 @@ mod crate_type {
 
 #[feature(x0600)]
 //~^ WARN crate-level attribute should be an inner attribute
-//~| HELP add a `!`
 mod feature {
+//~^ NOTE this attribute does not have an `!`, which means it is applied to this module
     mod inner { #![feature(x0600)] }
-//~^ WARN crate-level attribute should be in the root module
+    //~^ WARN the `#![feature]` attribute can only be used at the crate root
 
     #[feature(x0600)] fn f() { }
     //~^ WARN crate-level attribute should be an inner attribute
-    //~| HELP add a `!`
+    //~| NOTE this attribute does not have an `!`, which means it is applied to this function
 
     #[feature(x0600)] struct S;
     //~^ WARN crate-level attribute should be an inner attribute
-    //~| HELP add a `!`
+    //~| NOTE this attribute does not have an `!`, which means it is applied to this struct
 
     #[feature(x0600)] type T = S;
     //~^ WARN crate-level attribute should be an inner attribute
-    //~| HELP add a `!`
+    //~| NOTE this attribute does not have an `!`, which means it is applied to this type alias
 
     #[feature(x0600)] impl S { }
     //~^ WARN crate-level attribute should be an inner attribute
-    //~| HELP add a `!`
+    //~| NOTE this attribute does not have an `!`, which means it is applied to this implementation block
 }
 
 
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
@@ -207,17 +207,6 @@ note: the lint level is defined here
 LL | #![warn(unused_attributes, unknown_lints)]
    |         ^^^^^^^^^^^^^^^^^
 
-warning: crate-level attribute should be an inner attribute
-  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:860:1
-   |
-LL | #[feature(x0600)]
-   | ^^^^^^^^^^^^^^^^^
-   |
-help: add a `!`
-   |
-LL | #![feature(x0600)]
-   |  +
-
 warning: attribute should be applied to an `extern` block with non-Rust ABI
   --> $DIR/issue-43106-gating-of-builtin-attrs.rs:71:1
    |
@@ -282,56 +271,6 @@ LL |     #[link(name = "x")] extern "Rust" {}
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
-warning: crate-level attribute should be in the root module
-  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:864:17
-   |
-LL |     mod inner { #![feature(x0600)] }
-   |                 ^^^^^^^^^^^^^^^^^^
-
-warning: crate-level attribute should be an inner attribute
-  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:867:5
-   |
-LL |     #[feature(x0600)] fn f() { }
-   |     ^^^^^^^^^^^^^^^^^
-   |
-help: add a `!`
-   |
-LL |     #![feature(x0600)] fn f() { }
-   |      +
-
-warning: crate-level attribute should be an inner attribute
-  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:871:5
-   |
-LL |     #[feature(x0600)] struct S;
-   |     ^^^^^^^^^^^^^^^^^
-   |
-help: add a `!`
-   |
-LL |     #![feature(x0600)] struct S;
-   |      +
-
-warning: crate-level attribute should be an inner attribute
-  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:875:5
-   |
-LL |     #[feature(x0600)] type T = S;
-   |     ^^^^^^^^^^^^^^^^^
-   |
-help: add a `!`
-   |
-LL |     #![feature(x0600)] type T = S;
-   |      +
-
-warning: crate-level attribute should be an inner attribute
-  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:879:5
-   |
-LL |     #[feature(x0600)] impl S { }
-   |     ^^^^^^^^^^^^^^^^^
-   |
-help: add a `!`
-   |
-LL |     #![feature(x0600)] impl S { }
-   |      +
-
 warning: `#[macro_use]` attribute cannot be used on functions
   --> $DIR/issue-43106-gating-of-builtin-attrs.rs:190:5
    |
@@ -1303,6 +1242,76 @@ note: this attribute does not have an `!`, which means it is applied to this imp
 LL |     #[crate_type = "0800"] impl S { }
    |                            ^^^^^^^^^^
 
+warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![feature]`
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:860:1
+   |
+LL | #[feature(x0600)]
+   | ^^^^^^^^^^^^^^^^^
+   |
+note: this attribute does not have an `!`, which means it is applied to this module
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:862:1
+   |
+LL | / mod feature {
+LL | |
+LL | |     mod inner { #![feature(x0600)] }
+...  |
+LL | | }
+   | |_^
+
+warning: the `#![feature]` attribute can only be used at the crate root
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:864:17
+   |
+LL |     mod inner { #![feature(x0600)] }
+   |                 ^^^^^^^^^^^^^^^^^^
+
+warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![feature]`
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:867:5
+   |
+LL |     #[feature(x0600)] fn f() { }
+   |     ^^^^^^^^^^^^^^^^^
+   |
+note: this attribute does not have an `!`, which means it is applied to this function
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:867:23
+   |
+LL |     #[feature(x0600)] fn f() { }
+   |                       ^^^^^^^^^^
+
+warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![feature]`
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:871:5
+   |
+LL |     #[feature(x0600)] struct S;
+   |     ^^^^^^^^^^^^^^^^^
+   |
+note: this attribute does not have an `!`, which means it is applied to this struct
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:871:23
+   |
+LL |     #[feature(x0600)] struct S;
+   |                       ^^^^^^^^^
+
+warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![feature]`
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:875:5
+   |
+LL |     #[feature(x0600)] type T = S;
+   |     ^^^^^^^^^^^^^^^^^
+   |
+note: this attribute does not have an `!`, which means it is applied to this type alias
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:875:23
+   |
+LL |     #[feature(x0600)] type T = S;
+   |                       ^^^^^^^^^^^
+
+warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![feature]`
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:879:5
+   |
+LL |     #[feature(x0600)] impl S { }
+   |     ^^^^^^^^^^^^^^^^^
+   |
+note: this attribute does not have an `!`, which means it is applied to this implementation block
+  --> $DIR/issue-43106-gating-of-builtin-attrs.rs:879:23
+   |
+LL |     #[feature(x0600)] impl S { }
+   |                       ^^^^^^^^^^
+
 warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![no_main]`
   --> $DIR/issue-43106-gating-of-builtin-attrs.rs:885:1
    |
diff --git a/tests/ui/parser/inner-attr.stderr b/tests/ui/parser/inner-attr.stderr
@@ -11,17 +11,18 @@ LL | fn main() {}
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files
 
-warning: crate-level attribute should be an inner attribute
+warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![feature]`
   --> $DIR/inner-attr.rs:1:1
    |
 LL | #[feature(lang_items)]
    | ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: requested on the command line with `-W unused-attributes`
-help: add a `!`
+note: this attribute does not have an `!`, which means it is applied to this function
+  --> $DIR/inner-attr.rs:4:1
    |
-LL | #![feature(lang_items)]
-   |  +
+LL | fn main() {}
+   | ^^^^^^^^^^^^
+   = note: requested on the command line with `-W unused-attributes`
 
 error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/tests/ui/type-alias-impl-trait/issue-60662.stdout b/tests/ui/type-alias-impl-trait/issue-60662.stdout
diff --git a/tests/ui/unpretty/exhaustive.hir.stdout b/tests/ui/unpretty/exhaustive.hir.stdout
diff --git a/tests/ui/unpretty/struct-exprs-tuple-call-pretty-printing.stdout b/tests/ui/unpretty/struct-exprs-tuple-call-pretty-printing.stdout

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#[rustc_dummy(bar)]`
`6`	`6`	`mod foo {`
`7`	`7`	`#![feature(globs)]`
`8`		`- //~^ WARN crate-level attribute should be in the root module`
	`8`	+ //~^ WARN the `#![feature]` attribute can only be used at the crate root
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-warning: crate-level attribute should be in the root module`
	`1`	+warning: the `#![feature]` attribute can only be used at the crate root
`2`	`2`	`--> $DIR/attr-mix-new.rs:7:3`
`3`	`3`	`\|`
`4`	`4`	`LL \| #![feature(globs)]`