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

Address PR reviews

Browse source
This commit is contained in:
Oliver Schneider 2017-05-11 15:26:22 +02:00
parent f859f2585b
commit 644ce5e535
4 changed files with 59 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libsyntax/json.rs
View file

@ -279,12 +279,12 @@ impl DiagnosticSpan {
fn from_suggestion(suggestion: &CodeSuggestion, je: &JsonEmitter)
-> Vec<DiagnosticSpan> {
suggestion.substitutes
suggestion.substitution_parts
.iter()
.flat_map(|&(span, ref suggestion)| {
suggestion.iter().map(move |suggestion| {
.flat_map(|substitution| {
substitution.substitutions.iter().map(move |suggestion| {
let span_label = SpanLabel {
span,
span: substitution.span,
is_primary: true,
label: None,
};
@ -301,7 +301,7 @@ impl DiagnosticSpan {
RenderSpan::FullSpan(ref msp) =>
DiagnosticSpan::from_multispan(msp, je),
// regular diagnostics don't produce this anymore
// will be removed in a later commit
// FIXME(oli_obk): remove it entirely
RenderSpan::Suggestion(_) => unreachable!(),
}
}