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

Remove left over dead code from suggestion diagnostic refactoring

Browse source
This commit is contained in:
Oliver Schneider 2017-11-16 16:36:49 +01:00
parent c81f201d48
commit 47c7e430d3
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
20 changed files with 28 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libsyntax/json.rs
View file

@ -22,7 +22,7 @@
use codemap::{CodeMap, FilePathMapping};
use syntax_pos::{self, MacroBacktrace, Span, SpanLabel, MultiSpan};
use errors::registry::Registry;
use errors::{DiagnosticBuilder, SubDiagnostic, RenderSpan, CodeSuggestion, CodeMapper};
use errors::{DiagnosticBuilder, SubDiagnostic, CodeSuggestion, CodeMapper};
use errors::DiagnosticId;
use errors::emitter::Emitter;
@ -188,7 +188,7 @@ impl Diagnostic {
code: None,
level: db.level.to_str(),
spans: db.render_span.as_ref()
.map(|sp| DiagnosticSpan::from_render_span(sp, je))
.map(|sp| DiagnosticSpan::from_multispan(sp, je))
.unwrap_or_else(|| DiagnosticSpan::from_multispan(&db.span, je)),
children: vec![],
rendered: None,
@ -300,16 +300,6 @@ impl DiagnosticSpan {
})
.collect()
}
fn from_render_span(rsp: &RenderSpan, je: &JsonEmitter) -> Vec<DiagnosticSpan> {
match *rsp {
RenderSpan::FullSpan(ref msp) =>
DiagnosticSpan::from_multispan(msp, je),
// regular diagnostics don't produce this anymore
// FIXME(oli_obk): remove it entirely
RenderSpan::Suggestion(_) => unreachable!(),
}
}
}
impl DiagnosticSpanLine {