2022-06-10 14:50:06 +00:00
|
|
|
//@ compile-flags: -Z unstable-options
|
2024-03-05 00:54:37 +00:00
|
|
|
//@ ignore-stage1
|
2022-06-10 14:50:06 +00:00
|
|
|
|
|
|
|
#![crate_type = "lib"]
|
2022-08-31 11:06:22 +00:00
|
|
|
#![feature(rustc_attrs)]
|
2022-06-10 14:50:06 +00:00
|
|
|
#![feature(rustc_private)]
|
|
|
|
#![deny(rustc::untranslatable_diagnostic)]
|
|
|
|
#![deny(rustc::diagnostic_outside_of_impl)]
|
|
|
|
|
|
|
|
extern crate rustc_errors;
|
2023-04-16 12:33:00 +00:00
|
|
|
extern crate rustc_fluent_macro;
|
2022-06-10 14:50:06 +00:00
|
|
|
extern crate rustc_macros;
|
|
|
|
extern crate rustc_session;
|
|
|
|
extern crate rustc_span;
|
|
|
|
|
2022-09-05 16:05:14 +00:00
|
|
|
use rustc_errors::{
|
2024-06-18 10:35:56 +00:00
|
|
|
Diag, DiagCtxtHandle, DiagInner, DiagMessage, Diagnostic, EmissionGuarantee, Level,
|
|
|
|
LintDiagnostic, SubdiagMessage, SubdiagMessageOp, Subdiagnostic,
|
2022-09-05 16:05:14 +00:00
|
|
|
};
|
2023-04-16 12:33:00 +00:00
|
|
|
use rustc_macros::{Diagnostic, Subdiagnostic};
|
2022-06-10 14:50:06 +00:00
|
|
|
use rustc_span::Span;
|
|
|
|
|
2023-11-21 22:53:07 +00:00
|
|
|
rustc_fluent_macro::fluent_messages! { "./diagnostics.ftl" }
|
2022-10-13 09:13:02 +00:00
|
|
|
|
2022-09-18 15:46:56 +00:00
|
|
|
#[derive(Diagnostic)]
|
2022-10-13 09:13:02 +00:00
|
|
|
#[diag(no_crate_example)]
|
2022-09-15 04:01:44 +00:00
|
|
|
struct DeriveDiagnostic {
|
2022-06-10 14:50:06 +00:00
|
|
|
#[primary_span]
|
|
|
|
span: Span,
|
|
|
|
}
|
|
|
|
|
2022-09-18 15:47:31 +00:00
|
|
|
#[derive(Subdiagnostic)]
|
2022-10-13 09:13:02 +00:00
|
|
|
#[note(no_crate_example)]
|
2022-06-10 14:50:06 +00:00
|
|
|
struct Note {
|
|
|
|
#[primary_span]
|
|
|
|
span: Span,
|
|
|
|
}
|
|
|
|
|
2024-03-06 00:02:56 +00:00
|
|
|
pub struct UntranslatableInDiagnostic;
|
2022-06-10 14:50:06 +00:00
|
|
|
|
2024-03-06 00:02:56 +00:00
|
|
|
impl<'a, G: EmissionGuarantee> Diagnostic<'a, G> for UntranslatableInDiagnostic {
|
2024-06-18 10:35:56 +00:00
|
|
|
fn into_diag(self, dcx: DiagCtxtHandle<'a>, level: Level) -> Diag<'a, G> {
|
2024-02-22 23:20:45 +00:00
|
|
|
Diag::new(dcx, level, "untranslatable diagnostic")
|
2022-06-10 14:50:06 +00:00
|
|
|
//~^ ERROR diagnostics should be created using translatable messages
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-06 00:02:56 +00:00
|
|
|
pub struct TranslatableInDiagnostic;
|
2022-06-10 14:50:06 +00:00
|
|
|
|
2024-03-06 00:02:56 +00:00
|
|
|
impl<'a, G: EmissionGuarantee> Diagnostic<'a, G> for TranslatableInDiagnostic {
|
2024-06-18 10:35:56 +00:00
|
|
|
fn into_diag(self, dcx: DiagCtxtHandle<'a>, level: Level) -> Diag<'a, G> {
|
2024-02-22 23:20:45 +00:00
|
|
|
Diag::new(dcx, level, crate::fluent_generated::no_crate_example)
|
2022-06-10 14:50:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-06 03:00:16 +00:00
|
|
|
pub struct UntranslatableInAddtoDiag;
|
2022-06-10 14:50:06 +00:00
|
|
|
|
2024-03-06 03:00:16 +00:00
|
|
|
impl Subdiagnostic for UntranslatableInAddtoDiag {
|
|
|
|
fn add_to_diag_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
|
Reduce capabilities of `Diagnostic`.
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.
2024-02-06 05:44:30 +00:00
|
|
|
self,
|
2024-02-22 23:20:45 +00:00
|
|
|
diag: &mut Diag<'_, G>,
|
2024-04-18 19:18:35 +00:00
|
|
|
f: &F,
|
Reduce capabilities of `Diagnostic`.
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.
2024-02-06 05:44:30 +00:00
|
|
|
) {
|
2022-06-10 14:50:06 +00:00
|
|
|
diag.note("untranslatable diagnostic");
|
|
|
|
//~^ ERROR diagnostics should be created using translatable messages
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-06 03:00:16 +00:00
|
|
|
pub struct TranslatableInAddtoDiag;
|
2022-06-10 14:50:06 +00:00
|
|
|
|
2024-03-06 03:00:16 +00:00
|
|
|
impl Subdiagnostic for TranslatableInAddtoDiag {
|
|
|
|
fn add_to_diag_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
|
Reduce capabilities of `Diagnostic`.
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.
2024-02-06 05:44:30 +00:00
|
|
|
self,
|
2024-02-22 23:20:45 +00:00
|
|
|
diag: &mut Diag<'_, G>,
|
2024-04-18 19:18:35 +00:00
|
|
|
f: &F,
|
Reduce capabilities of `Diagnostic`.
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.
2024-02-06 05:44:30 +00:00
|
|
|
) {
|
2022-10-13 09:13:02 +00:00
|
|
|
diag.note(crate::fluent_generated::no_crate_note);
|
2022-06-10 14:50:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-08 01:03:51 +00:00
|
|
|
pub struct UntranslatableInLintDiagnostic;
|
2024-02-20 03:12:50 +00:00
|
|
|
|
2024-03-08 01:03:51 +00:00
|
|
|
impl<'a> LintDiagnostic<'a, ()> for UntranslatableInLintDiagnostic {
|
2024-06-18 10:35:56 +00:00
|
|
|
fn decorate_lint<'b>(self, diag: &'b mut Diag<'a, ()>) {
|
2024-02-20 03:12:50 +00:00
|
|
|
diag.note("untranslatable diagnostic");
|
|
|
|
//~^ ERROR diagnostics should be created using translatable messages
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-03-08 01:03:51 +00:00
|
|
|
pub struct TranslatableInLintDiagnostic;
|
2024-02-20 03:12:50 +00:00
|
|
|
|
2024-03-08 01:03:51 +00:00
|
|
|
impl<'a> LintDiagnostic<'a, ()> for TranslatableInLintDiagnostic {
|
2024-02-20 03:12:50 +00:00
|
|
|
fn decorate_lint<'b>(self, diag: &'b mut Diag<'a, ()>) {
|
|
|
|
diag.note(crate::fluent_generated::no_crate_note);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-06-18 10:35:56 +00:00
|
|
|
pub fn make_diagnostics<'a>(dcx: DiagCtxtHandle<'a>) {
|
2023-12-18 03:13:53 +00:00
|
|
|
let _diag = dcx.struct_err(crate::fluent_generated::no_crate_example);
|
2024-03-08 01:03:51 +00:00
|
|
|
//~^ ERROR diagnostics should only be created in `Diagnostic`/`Subdiagnostic`/`LintDiagnostic` impls
|
2022-06-10 14:50:06 +00:00
|
|
|
|
2023-12-18 03:13:53 +00:00
|
|
|
let _diag = dcx.struct_err("untranslatable diagnostic");
|
2024-03-08 01:03:51 +00:00
|
|
|
//~^ ERROR diagnostics should only be created in `Diagnostic`/`Subdiagnostic`/`LintDiagnostic` impls
|
2022-06-10 14:50:06 +00:00
|
|
|
//~^^ ERROR diagnostics should be created using translatable messages
|
|
|
|
}
|
2022-08-31 11:06:22 +00:00
|
|
|
|
2024-02-20 03:12:50 +00:00
|
|
|
// Check that `rustc_lint_diagnostics`-annotated functions aren't themselves linted for
|
|
|
|
// `diagnostic_outside_of_impl`.
|
2022-08-31 11:06:22 +00:00
|
|
|
#[rustc_lint_diagnostics]
|
2024-06-18 10:35:56 +00:00
|
|
|
pub fn skipped_because_of_annotation<'a>(dcx: DiagCtxtHandle<'a>) {
|
2024-02-20 03:12:50 +00:00
|
|
|
#[allow(rustc::untranslatable_diagnostic)]
|
2023-12-18 03:13:53 +00:00
|
|
|
let _diag = dcx.struct_err("untranslatable diagnostic"); // okay!
|
2022-08-31 11:06:22 +00:00
|
|
|
}
|
2024-03-10 22:06:08 +00:00
|
|
|
|
|
|
|
// Check that multiple translatable params are allowed in a single function (at one point they
|
|
|
|
// weren't).
|
|
|
|
fn f(_x: impl Into<DiagMessage>, _y: impl Into<SubdiagMessage>) {}
|
|
|
|
fn g() {
|
|
|
|
f(crate::fluent_generated::no_crate_example, crate::fluent_generated::no_crate_example);
|
2024-08-10 17:15:52 +00:00
|
|
|
f("untranslatable diagnostic", crate::fluent_generated::no_crate_example);
|
|
|
|
//~^ ERROR diagnostics should be created using translatable messages
|
|
|
|
f(crate::fluent_generated::no_crate_example, "untranslatable diagnostic");
|
|
|
|
//~^ ERROR diagnostics should be created using translatable messages
|
|
|
|
f("untranslatable diagnostic", "untranslatable diagnostic");
|
|
|
|
//~^ ERROR diagnostics should be created using translatable messages
|
|
|
|
//~^^ ERROR diagnostics should be created using translatable messages
|
2024-03-10 22:06:08 +00:00
|
|
|
}
|