mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error emitting code

Browse Source
This commit is contained in:
Guillaume Gomez 2023-05-04 11:17:56 +02:00
parent bbaa930b35
commit 87d2aa5fd3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustdoc/html/markdown.rs
View File

@ -26,6 +26,7 @@
//! ``` //! ```
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_middle::ty::TyCtxt; use rustc_middle::ty::TyCtxt;
pub(crate) use rustc_resolve::rustdoc::main_body_opts; pub(crate) use rustc_resolve::rustdoc::main_body_opts;
@ -808,7 +809,7 @@ pub(crate) fn new(tcx: TyCtxt<'tcx>, def_id: DefId, sp: Span) -> ExtraInfo<'tcx>
ExtraInfo { def_id, sp, tcx } ExtraInfo { def_id, sp, tcx }
} }
fn error_invalid_codeblock_attr(&self, msg: &str) { fn error_invalid_codeblock_attr(&self, msg: impl Into<DiagnosticMessage>) {
if let Some(def_id) = self.def_id.as_local() { if let Some(def_id) = self.def_id.as_local() {
self.tcx.struct_span_lint_hir( self.tcx.struct_span_lint_hir(
crate::lint::INVALID_CODEBLOCK_ATTRIBUTES, crate::lint::INVALID_CODEBLOCK_ATTRIBUTES,
@ -820,7 +821,11 @@ fn error_invalid_codeblock_attr(&self, msg: &str) {
} }
} }
fn error_invalid_codeblock_attr_with_help(&self, msg: &str, help: &str) { fn error_invalid_codeblock_attr_with_help(
&self,
msg: impl Into<DiagnosticMessage>,
help: impl Into<SubdiagnosticMessage>,
) {
if let Some(def_id) = self.def_id.as_local() { if let Some(def_id) = self.def_id.as_local() {
self.tcx.struct_span_lint_hir( self.tcx.struct_span_lint_hir(
crate::lint::INVALID_CODEBLOCK_ATTRIBUTES, crate::lint::INVALID_CODEBLOCK_ATTRIBUTES,
@ -1246,7 +1251,7 @@ fn parse(
} { } {
if let Some(extra) = extra { if let Some(extra) = extra {
extra.error_invalid_codeblock_attr_with_help( extra.error_invalid_codeblock_attr_with_help(
&format!("unknown attribute `{}`. Did you mean `{}`?", x, flag), format!("unknown attribute `{x}`. Did you mean `{flag}`?"),
help, help,
); );
} }
@ -1263,9 +1268,8 @@ fn parse(
if key == "class" { if key == "class" {
data.added_classes.push(value.to_owned()); data.added_classes.push(value.to_owned());
} else if let Some(extra) = extra { } else if let Some(extra) = extra {
extra.error_invalid_codeblock_attr(&format!( extra
"unsupported attribute `{key}`" .error_invalid_codeblock_attr(format!("unsupported attribute `{key}`"));
));
} }
} }
LangStringToken::ClassAttribute(class) => { LangStringToken::ClassAttribute(class) => {