nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

UPDATE - rename AddSubdiagnostic trait to AddToDiagnostic

Browse Source
This commit is contained in:
Jhonny Bill Mena 2022-09-18 11:46:16 -04:00
parent 19b348fed4
commit 191fac6826
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_ast_lowering/src/errors.rs
View File

@ -1,4 +1,4 @@
use rustc_errors::{fluent, AddSubdiagnostic, Applicability, Diagnostic, DiagnosticArgFromDisplay}; use rustc_errors::{fluent, AddToDiagnostic, Applicability, Diagnostic, DiagnosticArgFromDisplay};
use rustc_macros::{DiagnosticHandler, SessionSubdiagnostic}; use rustc_macros::{DiagnosticHandler, SessionSubdiagnostic};
use rustc_span::{symbol::Ident, Span, Symbol}; use rustc_span::{symbol::Ident, Span, Symbol};
@ -18,7 +18,7 @@ pub struct UseAngleBrackets {
pub close_param: Span, pub close_param: Span,
} }
impl AddSubdiagnostic for UseAngleBrackets { impl AddToDiagnostic for UseAngleBrackets {
fn add_to_diagnostic(self, diag: &mut Diagnostic) { fn add_to_diagnostic(self, diag: &mut Diagnostic) {
diag.multipart_suggestion( diag.multipart_suggestion(
fluent::ast_lowering::use_angle_brackets, fluent::ast_lowering::use_angle_brackets,
@ -54,7 +54,7 @@ pub enum AssocTyParenthesesSub {
NotEmpty { open_param: Span, close_param: Span }, NotEmpty { open_param: Span, close_param: Span },
} }
impl AddSubdiagnostic for AssocTyParenthesesSub { impl AddToDiagnostic for AssocTyParenthesesSub {
fn add_to_diagnostic(self, diag: &mut Diagnostic) { fn add_to_diagnostic(self, diag: &mut Diagnostic) {
match self { match self {
Self::Empty { parentheses_span } => diag.multipart_suggestion( Self::Empty { parentheses_span } => diag.multipart_suggestion(

2
compiler/rustc_error_messages/locales/en-US/lint.ftl
View File

@ -51,7 +51,7 @@ lint_non_existant_doc_keyword = found non-existing keyword `{$keyword}` used in
.help = only existing keywords are allowed in core/std .help = only existing keywords are allowed in core/std
lint_diag_out_of_impl = lint_diag_out_of_impl =
diagnostics should only be created in `IntoDiagnostic`/`AddSubdiagnostic` impls diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls
lint_untranslatable_diag = diagnostics should be created using translatable messages lint_untranslatable_diag = diagnostics should be created using translatable messages

4
compiler/rustc_errors/src/diagnostic.rs
View File

@ -178,7 +178,7 @@ impl IntoDiagnosticArg for hir::ConstContext {
/// Trait implemented by error types. This should not be implemented manually. Instead, use /// Trait implemented by error types. This should not be implemented manually. Instead, use
/// `#[derive(SessionSubdiagnostic)]` -- see [rustc_macros::SessionSubdiagnostic]. /// `#[derive(SessionSubdiagnostic)]` -- see [rustc_macros::SessionSubdiagnostic].
#[rustc_diagnostic_item = "AddSubdiagnostic"] #[rustc_diagnostic_item = "AddSubdiagnostic"]
pub trait AddSubdiagnostic { pub trait AddToDiagnostic {
/// Add a subdiagnostic to an existing diagnostic. /// Add a subdiagnostic to an existing diagnostic.
fn add_to_diagnostic(self, diag: &mut Diagnostic); fn add_to_diagnostic(self, diag: &mut Diagnostic);
} }
@ -893,7 +893,7 @@ impl Diagnostic {
/// Add a subdiagnostic from a type that implements `SessionSubdiagnostic` - see /// Add a subdiagnostic from a type that implements `SessionSubdiagnostic` - see
/// [rustc_macros::SessionSubdiagnostic]. /// [rustc_macros::SessionSubdiagnostic].
pub fn subdiagnostic(&mut self, subdiagnostic: impl AddSubdiagnostic) -> &mut Self { pub fn subdiagnostic(&mut self, subdiagnostic: impl AddToDiagnostic) -> &mut Self {
subdiagnostic.add_to_diagnostic(self); subdiagnostic.add_to_diagnostic(self);
self self
} }

2
compiler/rustc_errors/src/diagnostic_builder.rs
View File

@ -580,7 +580,7 @@ impl<'a, G: EmissionGuarantee> DiagnosticBuilder<'a, G> {
forward!(pub fn subdiagnostic( forward!(pub fn subdiagnostic(
&mut self, &mut self,
subdiagnostic: impl crate::AddSubdiagnostic subdiagnostic: impl crate::AddToDiagnostic
) -> &mut Self); ) -> &mut Self);
} }

2
compiler/rustc_errors/src/lib.rs
View File

@ -371,7 +371,7 @@ impl fmt::Display for ExplicitBug {
impl error::Error for ExplicitBug {} impl error::Error for ExplicitBug {}
pub use diagnostic::{ pub use diagnostic::{
AddSubdiagnostic, DecorateLint, Diagnostic, DiagnosticArg, DiagnosticArgFromDisplay, AddToDiagnostic, DecorateLint, Diagnostic, DiagnosticArg, DiagnosticArgFromDisplay,
DiagnosticArgValue, DiagnosticId, DiagnosticStyledString, IntoDiagnosticArg, SubDiagnostic, DiagnosticArgValue, DiagnosticId, DiagnosticStyledString, IntoDiagnosticArg, SubDiagnostic,
}; };
pub use diagnostic_builder::{DiagnosticBuilder, EmissionGuarantee, LintDiagnosticBuilder}; pub use diagnostic_builder::{DiagnosticBuilder, EmissionGuarantee, LintDiagnosticBuilder};

2
compiler/rustc_infer/src/infer/error_reporting/note.rs
View File

@ -2,7 +2,7 @@ use crate::errors::RegionOriginNote;
use crate::infer::error_reporting::note_and_explain_region; use crate::infer::error_reporting::note_and_explain_region;
use crate::infer::{self, InferCtxt, SubregionOrigin}; use crate::infer::{self, InferCtxt, SubregionOrigin};
use rustc_errors::{ use rustc_errors::{
fluent, struct_span_err, AddSubdiagnostic, Diagnostic, DiagnosticBuilder, ErrorGuaranteed, fluent, struct_span_err, AddToDiagnostic, Diagnostic, DiagnosticBuilder, ErrorGuaranteed,
}; };
use rustc_middle::traits::ObligationCauseCode; use rustc_middle::traits::ObligationCauseCode;
use rustc_middle::ty::error::TypeError; use rustc_middle::ty::error::TypeError;

6
compiler/rustc_lint/src/errors.rs
View File

@ -1,4 +1,4 @@
use rustc_errors::{fluent, AddSubdiagnostic, IntoDiagnostic, ErrorGuaranteed, Handler}; use rustc_errors::{fluent, AddToDiagnostic, IntoDiagnostic, ErrorGuaranteed, Handler};
use rustc_macros::{DiagnosticHandler, SessionSubdiagnostic}; use rustc_macros::{DiagnosticHandler, SessionSubdiagnostic};
use rustc_session::lint::Level; use rustc_session::lint::Level;
use rustc_span::{Span, Symbol}; use rustc_span::{Span, Symbol};
@ -22,7 +22,7 @@ pub enum OverruledAttributeSub {
CommandLineSource, CommandLineSource,
} }
impl AddSubdiagnostic for OverruledAttributeSub { impl AddToDiagnostic for OverruledAttributeSub {
fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) { fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) {
match self { match self {
OverruledAttributeSub::DefaultSource { id } => { OverruledAttributeSub::DefaultSource { id } => {
@ -87,7 +87,7 @@ pub struct RequestedLevel {
pub lint_name: String, pub lint_name: String,
} }
impl AddSubdiagnostic for RequestedLevel { impl AddToDiagnostic for RequestedLevel {
fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) { fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) {
diag.note(fluent::lint::requested_level); diag.note(fluent::lint::requested_level);
diag.set_arg( diag.set_arg(

2
compiler/rustc_lint/src/internal.rs
View File

@ -372,7 +372,7 @@ declare_tool_lint! {
declare_tool_lint! { declare_tool_lint! {
pub rustc::DIAGNOSTIC_OUTSIDE_OF_IMPL, pub rustc::DIAGNOSTIC_OUTSIDE_OF_IMPL,
Allow, Allow,
"prevent creation of diagnostics outside of `DiagnosticHandler`/`AddSubdiagnostic` impls", "prevent creation of diagnostics outside of `DiagnosticHandler`/`AddToDiagnostic` impls",
report_in_external_macro: true report_in_external_macro: true
} }

2
compiler/rustc_macros/src/diagnostics/subdiagnostic.rs
View File

@ -166,7 +166,7 @@ impl<'a> SessionSubdiagnosticDerive<'a> {
}; };
let ret = structure.gen_impl(quote! { let ret = structure.gen_impl(quote! {
gen impl rustc_errors::AddSubdiagnostic for @Self { gen impl rustc_errors::AddToDiagnostic for @Self {
fn add_to_diagnostic(self, #diag: &mut rustc_errors::Diagnostic) { fn add_to_diagnostic(self, #diag: &mut rustc_errors::Diagnostic) {
use rustc_errors::{Applicability, IntoDiagnosticArg}; use rustc_errors::{Applicability, IntoDiagnosticArg};
#implementation #implementation

14
src/test/ui-fulldeps/internal-lints/diagnostics.rs
View File

@ -12,7 +12,7 @@ extern crate rustc_session;
extern crate rustc_span; extern crate rustc_span;
use rustc_errors::{ use rustc_errors::{
AddSubdiagnostic, IntoDiagnostic, Diagnostic, DiagnosticBuilder, AddToDiagnostic, IntoDiagnostic, Diagnostic, DiagnosticBuilder,
ErrorGuaranteed, Handler, fluent ErrorGuaranteed, Handler, fluent
}; };
use rustc_macros::{DiagnosticHandler, SessionSubdiagnostic}; use rustc_macros::{DiagnosticHandler, SessionSubdiagnostic};
@ -49,18 +49,18 @@ impl<'a> IntoDiagnostic<'a, ErrorGuaranteed> for TranslatableInSessionDiagnostic
} }
} }
pub struct UntranslatableInAddSubdiagnostic; pub struct UntranslatableInAddToDiagnostic;
impl AddSubdiagnostic for UntranslatableInAddSubdiagnostic { impl AddToDiagnostic for UntranslatableInAddToDiagnostic {
fn add_to_diagnostic(self, diag: &mut Diagnostic) { fn add_to_diagnostic(self, diag: &mut Diagnostic) {
diag.note("untranslatable diagnostic"); diag.note("untranslatable diagnostic");
//~^ ERROR diagnostics should be created using translatable messages //~^ ERROR diagnostics should be created using translatable messages
} }
} }
pub struct TranslatableInAddSubdiagnostic; pub struct TranslatableInAddToDiagnostic;
impl AddSubdiagnostic for TranslatableInAddSubdiagnostic { impl AddToDiagnostic for TranslatableInAddToDiagnostic {
fn add_to_diagnostic(self, diag: &mut Diagnostic) { fn add_to_diagnostic(self, diag: &mut Diagnostic) {
diag.note(fluent::typeck::note); diag.note(fluent::typeck::note);
} }
@ -68,10 +68,10 @@ impl AddSubdiagnostic for TranslatableInAddSubdiagnostic {
pub fn make_diagnostics<'a>(handler: &'a Handler) { pub fn make_diagnostics<'a>(handler: &'a Handler) {
let _diag = handler.struct_err(fluent::parser::expect_path); let _diag = handler.struct_err(fluent::parser::expect_path);
//~^ ERROR diagnostics should only be created in `IntoDiagnostic`/`AddSubdiagnostic` impls //~^ ERROR diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls
let _diag = handler.struct_err("untranslatable diagnostic"); let _diag = handler.struct_err("untranslatable diagnostic");
//~^ ERROR diagnostics should only be created in `IntoDiagnostic`/`AddSubdiagnostic` impls //~^ ERROR diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls
//~^^ ERROR diagnostics should be created using translatable messages //~^^ ERROR diagnostics should be created using translatable messages
} }

4
src/test/ui-fulldeps/internal-lints/diagnostics.stderr
View File

@ -16,7 +16,7 @@ error: diagnostics should be created using translatable messages
LL | diag.note("untranslatable diagnostic"); LL | diag.note("untranslatable diagnostic");
| ^^^^ | ^^^^
error: diagnostics should only be created in `IntoDiagnostic`/`AddSubdiagnostic` impls error: diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls
--> $DIR/diagnostics.rs:70:25 --> $DIR/diagnostics.rs:70:25
| |
LL | let _diag = handler.struct_err(fluent::parser::expect_path); LL | let _diag = handler.struct_err(fluent::parser::expect_path);
@ -28,7 +28,7 @@ note: the lint level is defined here
LL | #![deny(rustc::diagnostic_outside_of_impl)] LL | #![deny(rustc::diagnostic_outside_of_impl)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: diagnostics should only be created in `IntoDiagnostic`/`AddSubdiagnostic` impls error: diagnostics should only be created in `IntoDiagnostic`/`AddToDiagnostic` impls
--> $DIR/diagnostics.rs:73:25 --> $DIR/diagnostics.rs:73:25
| |
LL | let _diag = handler.struct_err("untranslatable diagnostic"); LL | let _diag = handler.struct_err("untranslatable diagnostic");