Skip to content

Commit 14407fe

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#133187
Rollup merge of rust-lang#133187 - ehuss:reference-diagnostic, r=jieyouxu Add reference annotations for diagnostic attributes This adds reference annotations for `diagnostic::on_unimplmented` and the `diagnostic` namespace in general. There's also a rename for a test that looks like it was put in the wrong location.
2 parents 5926e82 + 1b0e787 commit 14407fe

28 files changed

+170
-147
lines changed

‎tests/ui/diagnostic_namespace/deny_malformed_attribute.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@ reference: attributes.diagnostic.namespace.unknown-invalid-syntax
2+
13
#![deny(unknown_or_malformed_diagnostic_attributes)]
24

35
#[diagnostic::unknown_attribute]

‎tests/ui/diagnostic_namespace/deny_malformed_attribute.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: unknown diagnostic attribute
2-
--> $DIR/deny_malformed_attribute.rs:3:15
2+
--> $DIR/deny_malformed_attribute.rs:5:15
33
|
44
LL | #[diagnostic::unknown_attribute]
55
| ^^^^^^^^^^^^^^^^^
66
|
77
note: the lint level is defined here
8-
--> $DIR/deny_malformed_attribute.rs:1:9
8+
--> $DIR/deny_malformed_attribute.rs:3:9
99
|
1010
LL | #![deny(unknown_or_malformed_diagnostic_attributes)]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/diagnostic_namespace/malformed_foreign_on_unimplemented.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ edition:2021
22
//@ aux-build:bad_on_unimplemented.rs
3+
//@ reference: attributes.diagnostic.on_unimplemented.syntax
34

45
// Do not ICE when encountering a malformed `#[diagnostic::on_unimplemented]` annotation in a
56
// dependency when incorrectly used (#124651).

‎tests/ui/diagnostic_namespace/malformed_foreign_on_unimplemented.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
error[E0277]: the trait bound `(): bad_on_unimplemented::MissingAttr` is not satisfied
2-
--> $DIR/malformed_foreign_on_unimplemented.rs:22:18
2+
--> $DIR/malformed_foreign_on_unimplemented.rs:23:18
33
|
44
LL | missing_attr(());
55
| ------------ ^^ the trait `bad_on_unimplemented::MissingAttr` is not implemented for `()`
66
| |
77
| required by a bound introduced by this call
88
|
99
note: required by a bound in `missing_attr`
10-
--> $DIR/malformed_foreign_on_unimplemented.rs:11:20
10+
--> $DIR/malformed_foreign_on_unimplemented.rs:12:20
1111
|
1212
LL | fn missing_attr<T: MissingAttr>(_: T) {}
1313
| ^^^^^^^^^^^ required by this bound in `missing_attr`
1414

1515
error[E0277]: the trait bound `(): bad_on_unimplemented::DuplicateAttr` is not satisfied
16-
--> $DIR/malformed_foreign_on_unimplemented.rs:23:20
16+
--> $DIR/malformed_foreign_on_unimplemented.rs:24:20
1717
|
1818
LL | duplicate_attr(());
1919
| -------------- ^^ a
@@ -22,55 +22,55 @@ LL | duplicate_attr(());
2222
|
2323
= help: the trait `bad_on_unimplemented::DuplicateAttr` is not implemented for `()`
2424
note: required by a bound in `duplicate_attr`
25-
--> $DIR/malformed_foreign_on_unimplemented.rs:12:22
25+
--> $DIR/malformed_foreign_on_unimplemented.rs:13:22
2626
|
2727
LL | fn duplicate_attr<T: DuplicateAttr>(_: T) {}
2828
| ^^^^^^^^^^^^^ required by this bound in `duplicate_attr`
2929

3030
error[E0277]: the trait bound `(): bad_on_unimplemented::NotMetaList` is not satisfied
31-
--> $DIR/malformed_foreign_on_unimplemented.rs:24:19
31+
--> $DIR/malformed_foreign_on_unimplemented.rs:25:19
3232
|
3333
LL | not_meta_list(());
3434
| ------------- ^^ the trait `bad_on_unimplemented::NotMetaList` is not implemented for `()`
3535
| |
3636
| required by a bound introduced by this call
3737
|
3838
note: required by a bound in `not_meta_list`
39-
--> $DIR/malformed_foreign_on_unimplemented.rs:13:21
39+
--> $DIR/malformed_foreign_on_unimplemented.rs:14:21
4040
|
4141
LL | fn not_meta_list<T: NotMetaList>(_: T) {}
4242
| ^^^^^^^^^^^ required by this bound in `not_meta_list`
4343

4444
error[E0277]: the trait bound `(): bad_on_unimplemented::Empty` is not satisfied
45-
--> $DIR/malformed_foreign_on_unimplemented.rs:25:11
45+
--> $DIR/malformed_foreign_on_unimplemented.rs:26:11
4646
|
4747
LL | empty(());
4848
| ----- ^^ the trait `bad_on_unimplemented::Empty` is not implemented for `()`
4949
| |
5050
| required by a bound introduced by this call
5151
|
5252
note: required by a bound in `empty`
53-
--> $DIR/malformed_foreign_on_unimplemented.rs:14:13
53+
--> $DIR/malformed_foreign_on_unimplemented.rs:15:13
5454
|
5555
LL | fn empty<T: Empty>(_: T) {}
5656
| ^^^^^ required by this bound in `empty`
5757

5858
error[E0277]: the trait bound `(): bad_on_unimplemented::WrongDelim` is not satisfied
59-
--> $DIR/malformed_foreign_on_unimplemented.rs:26:17
59+
--> $DIR/malformed_foreign_on_unimplemented.rs:27:17
6060
|
6161
LL | wrong_delim(());
6262
| ----------- ^^ the trait `bad_on_unimplemented::WrongDelim` is not implemented for `()`
6363
| |
6464
| required by a bound introduced by this call
6565
|
6666
note: required by a bound in `wrong_delim`
67-
--> $DIR/malformed_foreign_on_unimplemented.rs:15:19
67+
--> $DIR/malformed_foreign_on_unimplemented.rs:16:19
6868
|
6969
LL | fn wrong_delim<T: WrongDelim>(_: T) {}
7070
| ^^^^^^^^^^ required by this bound in `wrong_delim`
7171

7272
error[E0277]: the trait bound `(): bad_on_unimplemented::BadFormatter<()>` is not satisfied
73-
--> $DIR/malformed_foreign_on_unimplemented.rs:27:19
73+
--> $DIR/malformed_foreign_on_unimplemented.rs:28:19
7474
|
7575
LL | bad_formatter(());
7676
| ------------- ^^ ()
@@ -79,13 +79,13 @@ LL | bad_formatter(());
7979
|
8080
= help: the trait `bad_on_unimplemented::BadFormatter<()>` is not implemented for `()`
8181
note: required by a bound in `bad_formatter`
82-
--> $DIR/malformed_foreign_on_unimplemented.rs:16:21
82+
--> $DIR/malformed_foreign_on_unimplemented.rs:17:21
8383
|
8484
LL | fn bad_formatter<T: BadFormatter<()>>(_: T) {}
8585
| ^^^^^^^^^^^^^^^^ required by this bound in `bad_formatter`
8686

8787
error[E0277]: the trait bound `(): bad_on_unimplemented::NoImplicitArgs` is not satisfied
88-
--> $DIR/malformed_foreign_on_unimplemented.rs:28:22
88+
--> $DIR/malformed_foreign_on_unimplemented.rs:29:22
8989
|
9090
LL | no_implicit_args(());
9191
| ---------------- ^^ test {}
@@ -94,13 +94,13 @@ LL | no_implicit_args(());
9494
|
9595
= help: the trait `bad_on_unimplemented::NoImplicitArgs` is not implemented for `()`
9696
note: required by a bound in `no_implicit_args`
97-
--> $DIR/malformed_foreign_on_unimplemented.rs:17:24
97+
--> $DIR/malformed_foreign_on_unimplemented.rs:18:24
9898
|
9999
LL | fn no_implicit_args<T: NoImplicitArgs>(_: T) {}
100100
| ^^^^^^^^^^^^^^ required by this bound in `no_implicit_args`
101101

102102
error[E0277]: the trait bound `(): bad_on_unimplemented::MissingArg` is not satisfied
103-
--> $DIR/malformed_foreign_on_unimplemented.rs:29:17
103+
--> $DIR/malformed_foreign_on_unimplemented.rs:30:17
104104
|
105105
LL | missing_arg(());
106106
| ----------- ^^ {missing}
@@ -109,13 +109,13 @@ LL | missing_arg(());
109109
|
110110
= help: the trait `bad_on_unimplemented::MissingArg` is not implemented for `()`
111111
note: required by a bound in `missing_arg`
112-
--> $DIR/malformed_foreign_on_unimplemented.rs:18:19
112+
--> $DIR/malformed_foreign_on_unimplemented.rs:19:19
113113
|
114114
LL | fn missing_arg<T: MissingArg>(_: T) {}
115115
| ^^^^^^^^^^ required by this bound in `missing_arg`
116116

117117
error[E0277]: the trait bound `(): bad_on_unimplemented::BadArg` is not satisfied
118-
--> $DIR/malformed_foreign_on_unimplemented.rs:30:13
118+
--> $DIR/malformed_foreign_on_unimplemented.rs:31:13
119119
|
120120
LL | bad_arg(());
121121
| ------- ^^ {_}
@@ -124,7 +124,7 @@ LL | bad_arg(());
124124
|
125125
= help: the trait `bad_on_unimplemented::BadArg` is not implemented for `()`
126126
note: required by a bound in `bad_arg`
127-
--> $DIR/malformed_foreign_on_unimplemented.rs:19:15
127+
--> $DIR/malformed_foreign_on_unimplemented.rs:20:15
128128
|
129129
LL | fn bad_arg<T: BadArg>(_: T) {}
130130
| ^^^^^^ required by this bound in `bad_arg`

‎tests/ui/diagnostic_namespace/non_existing_attributes_accepted.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ check-pass
2+
//@ reference: attributes.diagnostic.namespace.unknown-invalid-syntax
23
#[diagnostic::non_existing_attribute]
34
//~^WARN unknown diagnostic attribute
45
pub trait Bar {

‎tests/ui/diagnostic_namespace/non_existing_attributes_accepted.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
warning: unknown diagnostic attribute
2-
--> $DIR/non_existing_attributes_accepted.rs:2:15
2+
--> $DIR/non_existing_attributes_accepted.rs:3:15
33
|
44
LL | #[diagnostic::non_existing_attribute]
55
| ^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(unknown_or_malformed_diagnostic_attributes)]` on by default
88

99
warning: unknown diagnostic attribute
10-
--> $DIR/non_existing_attributes_accepted.rs:7:15
10+
--> $DIR/non_existing_attributes_accepted.rs:8:15
1111
|
1212
LL | #[diagnostic::non_existing_attribute(with_option = "foo")]
1313
| ^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/diagnostic_namespace/on_unimplemented/broken_format.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//@ reference: attributes.diagnostic.on_unimplemented.invalid-string
12
#[diagnostic::on_unimplemented(message = "{{Test } thing")]
23
//~^WARN unmatched `}` found
34
//~|WARN unmatched `}` found

0 commit comments

Comments
 (0)