Skip to content

Commit 413ca5d

Browse files
committed
fix tests
1 parent 6bb29af commit 413ca5d

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

tests/ui/attributes/lint_on_root.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | #![inline = ""]
1111
error: aborting due to 1 previous error
1212

1313
Future incompatibility report: Future breakage diagnostic:
14-
error: valid forms for the attribute are `#[inline(always|never)]` and `#[inline]`
14+
error: valid forms for the attribute are `#[inline(always)]`, `#[inline(never)]`, and `#[inline]`
1515
--> $DIR/lint_on_root.rs:3:1
1616
|
1717
LL | #![inline = ""]

tests/ui/attributes/malformed-attrs.stderr

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -769,40 +769,43 @@ error: aborting due to 74 previous errors; 3 warnings emitted
769769
Some errors have detailed explanations: E0308, E0463, E0539, E0565, E0658, E0805.
770770
For more information about an error, try `rustc --explain E0308`.
771771
Future incompatibility report: Future breakage diagnostic:
772-
error: valid forms for the attribute are `#[doc(hidden|inline|...)]` and `#[doc = "string"]`
772+
error: valid forms for the attribute are `#[doc(hidden)]`, `#[doc(inline)]`, and `#[doc = "string"]`
773773
--> $DIR/malformed-attrs.rs:40:1
774774
|
775775
LL | #[doc]
776776
| ^^^^^^
777777
|
778778
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
779779
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
780+
= note: for more information, visit <https://doc.rust-lang.org/rustdoc/write-documentation/the-doc-attribute.html>
780781
= note: `#[deny(ill_formed_attribute_input)]` on by default
781782

782783
Future breakage diagnostic:
783-
error: valid forms for the attribute are `#[doc(hidden|inline|...)]` and `#[doc = "string"]`
784+
error: valid forms for the attribute are `#[doc(hidden)]`, `#[doc(inline)]`, and `#[doc = "string"]`
784785
--> $DIR/malformed-attrs.rs:73:1
785786
|
786787
LL | #[doc]
787788
| ^^^^^^
788789
|
789790
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
790791
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
792+
= note: for more information, visit <https://doc.rust-lang.org/rustdoc/write-documentation/the-doc-attribute.html>
791793
= note: `#[deny(ill_formed_attribute_input)]` on by default
792794

793795
Future breakage diagnostic:
794-
error: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ wasm_import_module = "...", /*opt*/ import_name_type = "decorated|noprefix|undecorated")]`
796+
error: valid forms for the attribute are `#[link(name = "...")]`, `#[link(name = "...", kind = "dylib|static|...")]`, `#[link(name = "...", wasm_import_module = "...")]`, `#[link(name = "...", import_name_type = "decorated|noprefix|undecorated")]`, and `#[link(name = "...", kind = "dylib|static|...", wasm_import_module = "...", import_name_type = "decorated|noprefix|undecorated")]`
795797
--> $DIR/malformed-attrs.rs:80:1
796798
|
797799
LL | #[link]
798800
| ^^^^^^^
799801
|
800802
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
801803
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
804+
= note: for more information, visit <https://doc.rust-lang.org/reference/items/external-blocks.html#the-link-attribute>
802805
= note: `#[deny(ill_formed_attribute_input)]` on by default
803806

804807
Future breakage diagnostic:
805-
error: valid forms for the attribute are `#[inline(always|never)]` and `#[inline]`
808+
error: valid forms for the attribute are `#[inline(always)]`, `#[inline(never)]`, and `#[inline]`
806809
--> $DIR/malformed-attrs.rs:50:1
807810
|
808811
LL | #[inline = 5]

tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ error: aborting due to 38 previous errors
319319
Some errors have detailed explanations: E0517, E0518, E0658.
320320
For more information about an error, try `rustc --explain E0517`.
321321
Future incompatibility report: Future breakage diagnostic:
322-
error: valid forms for the attribute are `#[inline(always|never)]` and `#[inline]`
322+
error: valid forms for the attribute are `#[inline(always)]`, `#[inline(never)]`, and `#[inline]`
323323
--> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:46:5
324324
|
325325
LL | #[inline = "2100"] fn f() { }

tests/ui/link-native-libs/link-attr-validation-early.stderr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,26 @@ LL | #[link = "foo"]
2222
error: aborting due to 2 previous errors
2323

2424
Future incompatibility report: Future breakage diagnostic:
25-
error: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ wasm_import_module = "...", /*opt*/ import_name_type = "decorated|noprefix|undecorated")]`
25+
error: valid forms for the attribute are `#[link(name = "...")]`, `#[link(name = "...", kind = "dylib|static|...")]`, `#[link(name = "...", wasm_import_module = "...")]`, `#[link(name = "...", import_name_type = "decorated|noprefix|undecorated")]`, and `#[link(name = "...", kind = "dylib|static|...", wasm_import_module = "...", import_name_type = "decorated|noprefix|undecorated")]`
2626
--> $DIR/link-attr-validation-early.rs:2:1
2727
|
2828
LL | #[link]
2929
| ^^^^^^^
3030
|
3131
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
3232
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
33+
= note: for more information, visit <https://doc.rust-lang.org/reference/items/external-blocks.html#the-link-attribute>
3334
= note: `#[deny(ill_formed_attribute_input)]` on by default
3435

3536
Future breakage diagnostic:
36-
error: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ wasm_import_module = "...", /*opt*/ import_name_type = "decorated|noprefix|undecorated")]`
37+
error: valid forms for the attribute are `#[link(name = "...")]`, `#[link(name = "...", kind = "dylib|static|...")]`, `#[link(name = "...", wasm_import_module = "...")]`, `#[link(name = "...", import_name_type = "decorated|noprefix|undecorated")]`, and `#[link(name = "...", kind = "dylib|static|...", wasm_import_module = "...", import_name_type = "decorated|noprefix|undecorated")]`
3738
--> $DIR/link-attr-validation-early.rs:4:1
3839
|
3940
LL | #[link = "foo"]
4041
| ^^^^^^^^^^^^^^^
4142
|
4243
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
4344
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
45+
= note: for more information, visit <https://doc.rust-lang.org/reference/items/external-blocks.html#the-link-attribute>
4446
= note: `#[deny(ill_formed_attribute_input)]` on by default
4547

tests/ui/malformed/malformed-regressions.stderr

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,36 +50,39 @@ LL | #[inline = ""]
5050
error: aborting due to 5 previous errors
5151

5252
Future incompatibility report: Future breakage diagnostic:
53-
error: valid forms for the attribute are `#[doc(hidden|inline|...)]` and `#[doc = "string"]`
53+
error: valid forms for the attribute are `#[doc(hidden)]`, `#[doc(inline)]`, and `#[doc = "string"]`
5454
--> $DIR/malformed-regressions.rs:1:1
5555
|
5656
LL | #[doc]
5757
| ^^^^^^
5858
|
5959
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
6060
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
61+
= note: for more information, visit <https://doc.rust-lang.org/rustdoc/write-documentation/the-doc-attribute.html>
6162
= note: `#[deny(ill_formed_attribute_input)]` on by default
6263

6364
Future breakage diagnostic:
64-
error: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ wasm_import_module = "...", /*opt*/ import_name_type = "decorated|noprefix|undecorated")]`
65+
error: valid forms for the attribute are `#[link(name = "...")]`, `#[link(name = "...", kind = "dylib|static|...")]`, `#[link(name = "...", wasm_import_module = "...")]`, `#[link(name = "...", import_name_type = "decorated|noprefix|undecorated")]`, and `#[link(name = "...", kind = "dylib|static|...", wasm_import_module = "...", import_name_type = "decorated|noprefix|undecorated")]`
6566
--> $DIR/malformed-regressions.rs:7:1
6667
|
6768
LL | #[link]
6869
| ^^^^^^^
6970
|
7071
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
7172
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
73+
= note: for more information, visit <https://doc.rust-lang.org/reference/items/external-blocks.html#the-link-attribute>
7274
= note: `#[deny(ill_formed_attribute_input)]` on by default
7375

7476
Future breakage diagnostic:
75-
error: attribute must be of the form `#[link(name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ wasm_import_module = "...", /*opt*/ import_name_type = "decorated|noprefix|undecorated")]`
77+
error: valid forms for the attribute are `#[link(name = "...")]`, `#[link(name = "...", kind = "dylib|static|...")]`, `#[link(name = "...", wasm_import_module = "...")]`, `#[link(name = "...", import_name_type = "decorated|noprefix|undecorated")]`, and `#[link(name = "...", kind = "dylib|static|...", wasm_import_module = "...", import_name_type = "decorated|noprefix|undecorated")]`
7678
--> $DIR/malformed-regressions.rs:9:1
7779
|
7880
LL | #[link = ""]
7981
| ^^^^^^^^^^^^
8082
|
8183
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
8284
= note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
85+
= note: for more information, visit <https://doc.rust-lang.org/reference/items/external-blocks.html#the-link-attribute>
8386
= note: `#[deny(ill_formed_attribute_input)]` on by default
8487

8588
Future breakage diagnostic:
@@ -94,7 +97,7 @@ LL | #[ignore()]
9497
= note: `#[deny(ill_formed_attribute_input)]` on by default
9598

9699
Future breakage diagnostic:
97-
error: valid forms for the attribute are `#[inline(always|never)]` and `#[inline]`
100+
error: valid forms for the attribute are `#[inline(always)]`, `#[inline(never)]`, and `#[inline]`
98101
--> $DIR/malformed-regressions.rs:5:1
99102
|
100103
LL | #[inline = ""]

0 commit comments

Comments
 (0)