bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Implement IntoDiagnosticArg for rustc_ast::Path

Browse source
This commit is contained in:
Xiretza 2022-09-14 19:22:20 +02:00
parent 495e271883
commit 8489a67f0b
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock
View file

@ -3438,6 +3438,8 @@ version = "0.0.0"
dependencies = [ dependencies = [
"annotate-snippets", "annotate-snippets",
"atty", "atty",
"rustc_ast",
"rustc_ast_pretty",
"rustc_data_structures", "rustc_data_structures",
"rustc_error_messages", "rustc_error_messages",
"rustc_hir", "rustc_hir",

2
compiler/rustc_errors/Cargo.toml
View file

@ -8,6 +8,8 @@ doctest = false
[dependencies] [dependencies]
tracing = "0.1" tracing = "0.1"
rustc_ast = { path = "../rustc_ast" }
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
rustc_error_messages = { path = "../rustc_error_messages" } rustc_error_messages = { path = "../rustc_error_messages" }
rustc_serialize = { path = "../rustc_serialize" } rustc_serialize = { path = "../rustc_serialize" }
rustc_span = { path = "../rustc_span" } rustc_span = { path = "../rustc_span" }

8
compiler/rustc_errors/src/diagnostic.rs
View file

@ -3,6 +3,8 @@ use crate::{
CodeSuggestion, DiagnosticMessage, EmissionGuarantee, Level, LintDiagnosticBuilder, MultiSpan, CodeSuggestion, DiagnosticMessage, EmissionGuarantee, Level, LintDiagnosticBuilder, MultiSpan,
SubdiagnosticMessage, Substitution, SubstitutionPart, SuggestionStyle, SubdiagnosticMessage, Substitution, SubstitutionPart, SuggestionStyle,
}; };
use rustc_ast as ast;
use rustc_ast_pretty::pprust;
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_error_messages::FluentValue; use rustc_error_messages::FluentValue;
use rustc_hir as hir; use rustc_hir as hir;
@ -175,6 +177,12 @@ impl IntoDiagnosticArg for hir::ConstContext {
} }
} }
impl IntoDiagnosticArg for ast::Path {
fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> {
DiagnosticArgValue::Str(Cow::Owned(pprust::path_to_string(&self)))
}
}
/// 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(Subdiagnostic)]` -- see [rustc_macros::Subdiagnostic]. /// `#[derive(Subdiagnostic)]` -- see [rustc_macros::Subdiagnostic].
#[cfg_attr(bootstrap, rustc_diagnostic_item = "AddSubdiagnostic")] #[cfg_attr(bootstrap, rustc_diagnostic_item = "AddSubdiagnostic")]