From 62068a59eea44ff78c4293d5fcc676279b1deab0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aur=C3=A9lien=20Deharbe?= <aurelien.deharbe@ssi.gouv.fr>
Date: Fri, 11 Sep 2020 17:31:52 +0200
Subject: [PATCH] repairing broken error message and rustfix application for
 the new test case

---
 compiler/rustc_parse/src/parser/mod.rs |  6 +++++-
 src/test/ui/issue-76597.fixed          | 11 +++++++++++
 src/test/ui/issue-76597.rs             |  4 ++++
 src/test/ui/issue-76597.stderr         | 17 ++++++++---------
 4 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 src/test/ui/issue-76597.fixed

diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs
index 5eefae3af60..7340c574480 100644
--- a/compiler/rustc_parse/src/parser/mod.rs
+++ b/compiler/rustc_parse/src/parser/mod.rs
@@ -694,9 +694,13 @@ fn parse_seq_to_before_tokens<T>(
                                 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,
diff --git a/src/test/ui/issue-76597.fixed b/src/test/ui/issue-76597.fixed
new file mode 100644
index 00000000000..2d7a30b8361
--- /dev/null
+++ b/src/test/ui/issue-76597.fixed
@@ -0,0 +1,11 @@
+// run-rustfix
+
+#![allow(dead_code)]
+#![allow(unused_variables)]
+fn f(
+                                     x: u8,
+                                     y: u8,
+) {}
+//~^^ ERROR: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `y`
+
+fn main() {}
diff --git a/src/test/ui/issue-76597.rs b/src/test/ui/issue-76597.rs
index 879e6b49e9b..521b9c64b1c 100644
--- a/src/test/ui/issue-76597.rs
+++ b/src/test/ui/issue-76597.rs
@@ -1,3 +1,7 @@
+// run-rustfix
+
+#![allow(dead_code)]
+#![allow(unused_variables)]
 fn f(
                                      x: u8
                                      y: u8,
diff --git a/src/test/ui/issue-76597.stderr b/src/test/ui/issue-76597.stderr
index 163ce61cb18..50b23329f0c 100644
--- a/src/test/ui/issue-76597.stderr
+++ b/src/test/ui/issue-76597.stderr
@@ -1,14 +1,13 @@
 error: expected one of `!`, `(`, `)`, `+`, `,`, `::`, or `<`, found `y`
-  --> $DIR/issue-76597.rs:3:38
+  --> $DIR/issue-76597.rs:7:38
    |
-LL |   ...                   x: u8
-   |                              - expected one of 7 possible tokens
-   |  ____________________________|
-   | |
-LL | | ...                   y: u8,
-|  | |                       ^ unexpected token
-|  | |
-   |   help: missing `,`
+LL | ...                   x: u8
+   |                            -
+   |                            |
+   |                            expected one of 7 possible tokens
+   |                            help: missing `,`
+LL | ...                   y: u8,
+   |                       ^ unexpected token
 
 error: aborting due to previous error
 
-- 
2.44.0