f6f8779843
Currently many diagnostic modifier methods are available on both `Diagnostic` and `DiagnosticBuilder`. This commit removes most of them from `Diagnostic`. To minimize the diff size, it keeps them within `diagnostic.rs` but changes the surrounding `impl Diagnostic` block to `impl DiagnosticBuilder`. (I intend to move things around later, to give a more sensible code layout.) `Diagnostic` keeps a few methods that it still needs, like `sub`, `arg`, and `replace_args`. The `forward!` macro, which defined two additional methods per call (e.g. `note` and `with_note`), is replaced by the `with_fn!` macro, which defines one additional method per call (e.g. `with_note`). It's now also only used when necessary -- not all modifier methods currently need a `with_*` form. (New ones can be easily added as necessary.) All this also requires changing `trait AddToDiagnostic` so its methods take `DiagnosticBuilder` instead of `Diagnostic`, which leads to many mechanical changes. `SubdiagnosticMessageOp` gains a type parameter `G`. There are three subdiagnostics -- `DelayedAtWithoutNewline`, `DelayedAtWithNewline`, and `InvalidFlushedDelayedDiagnosticLevel` -- that are created within the diagnostics machinery and appended to external diagnostics. These are handled at the `Diagnostic` level, which means it's now hard to construct them via `derive(Diagnostic)`, so instead we construct them by hand. This has no effect on what they look like when printed. There are lots of new `allow` markers for `untranslatable_diagnostics` and `diagnostics_outside_of_impl`. This is because `#[rustc_lint_diagnostics]` annotations were present on the `Diagnostic` modifier methods, but missing from the `DiagnosticBuilder` modifier methods. They're now present.
44 lines
1.4 KiB
Text
44 lines
1.4 KiB
Text
error: diagnostics should be created using translatable messages
|
|
--> $DIR/diagnostics.rs:42:9
|
|
|
|
|
LL | DiagnosticBuilder::new(dcx, level, "untranslatable diagnostic")
|
|
| ^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
|
note: the lint level is defined here
|
|
--> $DIR/diagnostics.rs:6:9
|
|
|
|
|
LL | #![deny(rustc::untranslatable_diagnostic)]
|
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
error: diagnostics should be created using translatable messages
|
|
--> $DIR/diagnostics.rs:63:14
|
|
|
|
|
LL | diag.note("untranslatable diagnostic");
|
|
| ^^^^
|
|
|
|
error: diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls
|
|
--> $DIR/diagnostics.rs:81:21
|
|
|
|
|
LL | let _diag = dcx.struct_err(crate::fluent_generated::no_crate_example);
|
|
| ^^^^^^^^^^
|
|
|
|
|
note: the lint level is defined here
|
|
--> $DIR/diagnostics.rs:7:9
|
|
|
|
|
LL | #![deny(rustc::diagnostic_outside_of_impl)]
|
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
error: diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls
|
|
--> $DIR/diagnostics.rs:84:21
|
|
|
|
|
LL | let _diag = dcx.struct_err("untranslatable diagnostic");
|
|
| ^^^^^^^^^^
|
|
|
|
error: diagnostics should be created using translatable messages
|
|
--> $DIR/diagnostics.rs:84:21
|
|
|
|
|
LL | let _diag = dcx.struct_err("untranslatable diagnostic");
|
|
| ^^^^^^^^^^
|
|
|
|
error: aborting due to 5 previous errors
|
|
|