diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/json.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs index e60edafe4ee..909b0031d61 100644 --- a/src/libsyntax/json.rs +++ b/src/libsyntax/json.rs @@ -359,7 +359,7 @@ impl DiagnosticCode { impl JsonEmitter { fn render(&self, suggestion: &CodeSuggestion) -> Vec<String> { - suggestion.splice_lines(&*self.cm) + suggestion.splice_lines(&*self.cm).iter().map(|line| line.0.to_owned()).collect() } } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index c248e20b608..23d85232369 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2920,10 +2920,6 @@ impl<'a> Parser<'a> { err.cancel(); let codemap = self.sess.codemap(); let suggestion_span = lhs_span.to(self.prev_span); - let suggestion = match codemap.span_to_snippet(suggestion_span) { - Ok(lstring) => format!("({})", lstring), - _ => format!("(<expression> as <type>)") - }; let warn_message = match codemap.span_to_snippet(self.prev_span) { Ok(lstring) => format!("`{}`", lstring), _ => "a type".to_string(), @@ -2934,6 +2930,10 @@ impl<'a> Parser<'a> { let mut err = self.sess.span_diagnostic.struct_span_err(sp, &msg); err.span_label(sp, "interpreted as generic argument"); err.span_label(self.span, "not interpreted as comparison"); + let suggestion = match codemap.span_to_snippet(suggestion_span) { + Ok(lstring) => format!("({})", lstring), + _ => format!("(<expression> as <type>)") + }; err.span_suggestion(suggestion_span, "if you want to compare the casted value then write:", suggestion); |