bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

annotate-snippet emitter: Deal with multispans from macros, too

Browse source 
This moves the two methods from the `EmitterWriter` impl to trait
default methods in the `Emitter` trait so that they can be re-used by
the `AnnotateSnippetEmitterWriter`.

Closes #61810
This commit is contained in:
Philipp Hansch 2019-09-05 21:31:12 +02:00
parent f257c40b19
commit 159d249705
No known key found for this signature in database
GPG key ID: 82AA61CAA11397E6
2 changed files with 136 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_errors/annotate_snippet_emitter_writer.rs
View file

@ -30,10 +30,14 @@ pub struct AnnotateSnippetEmitterWriter {
impl Emitter for AnnotateSnippetEmitterWriter {
/// The entry point for the diagnostics generation
fn emit_diagnostic(&mut self, db: &DiagnosticBuilder<'_>) {
let children = db.children.clone();
let (primary_span, suggestions) = self.primary_span_formatted(&db);
let mut children = db.children.clone();
let (mut primary_span, suggestions) = self.primary_span_formatted(&db);
// FIXME(#59346): Add `fix_multispans_in_std_macros` function from emitter.rs
self.fix_multispans_in_std_macros(&self.source_map,
&mut primary_span,
&mut children,
&db.level,
db.handler.flags.external_macro_backtrace);
self.emit_messages_default(&db.level,
db.message(),