-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #100776 - Rejyr:diagnostic-migration-rustc-lint, r=da…
…vidtwco Migrate `rustc_lint` errors to `SessionDiagnostic` Draft PR for migrating `rustc_lint` to `SessionDiagnostic`, as part of the [recent blog post](https://blog.rust-lang.org/inside-rust/2022/08/16/diagnostic-effort.html)
- Loading branch information
Showing
6 changed files
with
297 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| use rustc_errors::{fluent, AddSubdiagnostic, ErrorGuaranteed}; | ||
| use rustc_macros::{SessionDiagnostic, SessionSubdiagnostic}; | ||
| use rustc_session::{lint::Level, parse::ParseSess, SessionDiagnostic}; | ||
| use rustc_span::{Span, Symbol}; | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::overruled_attribute, code = "E0453")] | ||
| pub struct OverruledAttribute { | ||
| #[primary_span] | ||
| pub span: Span, | ||
| #[label] | ||
| pub overruled: Span, | ||
| pub lint_level: String, | ||
| pub lint_source: Symbol, | ||
| #[subdiagnostic] | ||
| pub sub: OverruledAttributeSub, | ||
| } | ||
| // | ||
| pub enum OverruledAttributeSub { | ||
| DefaultSource { id: String }, | ||
| NodeSource { span: Span, reason: Option<Symbol> }, | ||
| CommandLineSource, | ||
| } | ||
|
|
||
| impl AddSubdiagnostic for OverruledAttributeSub { | ||
| fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) { | ||
| match self { | ||
| OverruledAttributeSub::DefaultSource { id } => { | ||
| diag.note(fluent::lint::default_source); | ||
| diag.set_arg("id", id); | ||
| } | ||
| OverruledAttributeSub::NodeSource { span, reason } => { | ||
| diag.span_label(span, fluent::lint::node_source); | ||
| if let Some(rationale) = reason { | ||
| diag.note(rationale.as_str()); | ||
| } | ||
| } | ||
| OverruledAttributeSub::CommandLineSource => { | ||
| diag.note(fluent::lint::command_line_source); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::malformed_attribute, code = "E0452")] | ||
| pub struct MalformedAttribute { | ||
| #[primary_span] | ||
| pub span: Span, | ||
| #[subdiagnostic] | ||
| pub sub: MalformedAttributeSub, | ||
| } | ||
|
|
||
| #[derive(SessionSubdiagnostic)] | ||
| pub enum MalformedAttributeSub { | ||
| #[label(lint::bad_attribute_argument)] | ||
| BadAttributeArgument(#[primary_span] Span), | ||
| #[label(lint::reason_must_be_string_literal)] | ||
| ReasonMustBeStringLiteral(#[primary_span] Span), | ||
| #[label(lint::reason_must_come_last)] | ||
| ReasonMustComeLast(#[primary_span] Span), | ||
| } | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::unknown_tool_in_scoped_lint, code = "E0710")] | ||
| pub struct UnknownToolInScopedLint { | ||
| #[primary_span] | ||
| pub span: Option<Span>, | ||
| pub tool_name: Symbol, | ||
| pub lint_name: String, | ||
| #[help] | ||
| pub is_nightly_build: Option<()>, | ||
| } | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::builtin_ellipsis_inclusive_range_patterns, code = "E0783")] | ||
| pub struct BuiltinEllpisisInclusiveRangePatterns { | ||
| #[primary_span] | ||
| pub span: Span, | ||
| #[suggestion_short(code = "{replace}", applicability = "machine-applicable")] | ||
| pub suggestion: Span, | ||
| pub replace: String, | ||
| } | ||
|
|
||
| pub struct RequestedLevel { | ||
| pub level: Level, | ||
| pub lint_name: String, | ||
| } | ||
|
|
||
| impl AddSubdiagnostic for RequestedLevel { | ||
| fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) { | ||
| diag.note(fluent::lint::requested_level); | ||
| diag.set_arg( | ||
| "level", | ||
| match self.level { | ||
| Level::Allow => "-A", | ||
| Level::Warn => "-W", | ||
| Level::ForceWarn(_) => "--force-warn", | ||
| Level::Deny => "-D", | ||
| Level::Forbid => "-F", | ||
| Level::Expect(_) => { | ||
| unreachable!("lints with the level of `expect` should not run this code"); | ||
| } | ||
| }, | ||
| ); | ||
| diag.set_arg("lint_name", self.lint_name); | ||
| } | ||
| } | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::unsupported_group, code = "E0602")] | ||
| pub struct UnsupportedGroup { | ||
| pub lint_group: String, | ||
| } | ||
|
|
||
| pub struct CheckNameUnknown { | ||
| pub lint_name: String, | ||
| pub suggestion: Option<Symbol>, | ||
| pub sub: RequestedLevel, | ||
| } | ||
|
|
||
| impl SessionDiagnostic<'_> for CheckNameUnknown { | ||
| fn into_diagnostic( | ||
| self, | ||
| sess: &ParseSess, | ||
| ) -> rustc_errors::DiagnosticBuilder<'_, ErrorGuaranteed> { | ||
| let mut diag = sess.struct_err(fluent::lint::check_name_unknown); | ||
| diag.code(rustc_errors::error_code!(E0602)); | ||
| if let Some(suggestion) = self.suggestion { | ||
| diag.help(fluent::lint::help); | ||
| diag.set_arg("suggestion", suggestion); | ||
| } | ||
| diag.set_arg("lint_name", self.lint_name); | ||
| diag.subdiagnostic(self.sub); | ||
| diag | ||
| } | ||
| } | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::check_name_unknown_tool, code = "E0602")] | ||
| pub struct CheckNameUnknownTool { | ||
| pub tool_name: Symbol, | ||
| #[subdiagnostic] | ||
| pub sub: RequestedLevel, | ||
| } | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::check_name_warning)] | ||
| pub struct CheckNameWarning { | ||
| pub msg: String, | ||
| #[subdiagnostic] | ||
| pub sub: RequestedLevel, | ||
| } | ||
|
|
||
| #[derive(SessionDiagnostic)] | ||
| #[diag(lint::check_name_deprecated)] | ||
| pub struct CheckNameDeprecated { | ||
| pub lint_name: String, | ||
| pub new_name: String, | ||
| #[subdiagnostic] | ||
| pub sub: RequestedLevel, | ||
| } |
Oops, something went wrong.