Skip to content

Commit e304c21

Browse files
Update remaining session-diagnostics tests
1 parent dc38996 commit e304c21

6 files changed

Lines changed: 180 additions & 185 deletions

tests/ui-fulldeps/session-diagnostic/diagnostic-derive-doc-comment-field.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![crate_type = "lib"]
1515

1616
extern crate rustc_errors;
17-
extern crate rustc_fluent_macro;
1817
extern crate rustc_macros;
1918
extern crate rustc_session;
2019
extern crate rustc_span;
@@ -24,12 +23,10 @@ use rustc_errors::{Applicability, DiagMessage, SubdiagMessage};
2423
use rustc_macros::{Diagnostic, Subdiagnostic};
2524
use rustc_span::Span;
2625

27-
rustc_fluent_macro::fluent_messages! { "./example.ftl" }
28-
2926
struct NotIntoDiagArg;
3027

3128
#[derive(Diagnostic)]
32-
#[diag(no_crate_example)]
29+
#[diag("example message")]
3330
struct Test {
3431
#[primary_span]
3532
span: Span,
@@ -39,7 +36,7 @@ struct Test {
3936
}
4037

4138
#[derive(Subdiagnostic)]
42-
#[label(no_crate_example)]
39+
#[label("example message")]
4340
struct SubTest {
4441
#[primary_span]
4542
span: Span,

tests/ui-fulldeps/session-diagnostic/diagnostic-derive-doc-comment-field.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `NotIntoDiagArg: IntoDiagArg` is not satisfied
2-
--> $DIR/diagnostic-derive-doc-comment-field.rs:37:10
2+
--> $DIR/diagnostic-derive-doc-comment-field.rs:34:10
33
|
44
LL | #[derive(Diagnostic)]
55
| ---------- required by a bound introduced by this call
@@ -8,7 +8,7 @@ LL | arg: NotIntoDiagArg,
88
| ^^^^^^^^^^^^^^ unsatisfied trait bound
99
|
1010
help: the nightly-only, unstable trait `IntoDiagArg` is not implemented for `NotIntoDiagArg`
11-
--> $DIR/diagnostic-derive-doc-comment-field.rs:29:1
11+
--> $DIR/diagnostic-derive-doc-comment-field.rs:26:1
1212
|
1313
LL | struct NotIntoDiagArg;
1414
| ^^^^^^^^^^^^^^^^^^^^^
@@ -21,7 +21,7 @@ note: required by a bound in `Diag::<'a, G>::arg`
2121
= note: this error originates in the macro `with_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
2222

2323
error[E0277]: the trait bound `NotIntoDiagArg: IntoDiagArg` is not satisfied
24-
--> $DIR/diagnostic-derive-doc-comment-field.rs:47:10
24+
--> $DIR/diagnostic-derive-doc-comment-field.rs:44:10
2525
|
2626
LL | #[derive(Subdiagnostic)]
2727
| ------------- required by a bound introduced by this call
@@ -30,7 +30,7 @@ LL | arg: NotIntoDiagArg,
3030
| ^^^^^^^^^^^^^^ unsatisfied trait bound
3131
|
3232
help: the nightly-only, unstable trait `IntoDiagArg` is not implemented for `NotIntoDiagArg`
33-
--> $DIR/diagnostic-derive-doc-comment-field.rs:29:1
33+
--> $DIR/diagnostic-derive-doc-comment-field.rs:26:1
3434
|
3535
LL | struct NotIntoDiagArg;
3636
| ^^^^^^^^^^^^^^^^^^^^^

tests/ui-fulldeps/session-diagnostic/diagnostic-derive-inline.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ extern crate rustc_span;
1919
use rustc_span::symbol::Ident;
2020
use rustc_span::Span;
2121

22-
extern crate rustc_fluent_macro;
2322
extern crate rustc_macros;
2423
use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
2524

0 commit comments

Comments
 (0)