repairing broken error message and rustfix application for the new test

case
2020-09-11 17:31:52 +02:00
parent f9059a41b4
commit 62068a59ee
4 changed files with 28 additions and 10 deletions
--- a/compiler/rustc_parse/src/parser/mod.rs
+++ b/compiler/rustc_parse/src/parser/mod.rs
@@ -694,9 +694,13 @@ impl<'a> Parser<'a> {
                                Ok(t) => {
                                    // Parsed successfully, therefore most probably the code only
                                    // misses a separator.
+                                    let mut exp_span = self.sess.source_map().next_point(sp);
+                                    if self.sess.source_map().is_multiline(exp_span) {
+                                        exp_span = sp;
+                                    }
                                    expect_err
                                        .span_suggestion_short(
-                                            self.sess.source_map().next_point(sp),
+                                            exp_span,
                                            &format!("missing `{}`", token_str),
                                            token_str,
                                            Applicability::MaybeIncorrect,