From 655beb4ece8a116c664ae63f26811ba75aa9e0e7 Mon Sep 17 00:00:00 2001
From: Shrey Sudhir <shrey.somaiya@gmail.com>
Date: Thu, 1 Dec 2022 14:12:33 +0000
Subject: [PATCH] Attempt to address review comments via github web...

---
 compiler/rustc_parse/src/parser/diagnostics.rs               | 5 ++---
 src/test/ui/parser/suggest_misplaced_generics/enum.stderr    | 2 +-
 .../suggest_misplaced_generics/fn-complex-generics.stderr    | 2 +-
 .../ui/parser/suggest_misplaced_generics/fn-simple.stderr    | 2 +-
 src/test/ui/parser/suggest_misplaced_generics/struct.stderr  | 2 +-
 src/test/ui/parser/suggest_misplaced_generics/trait.stderr   | 2 +-
 src/test/ui/parser/suggest_misplaced_generics/type.stderr    | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
index 1e1e804c0d30..94bedc07ba15 100644
--- a/compiler/rustc_parse/src/parser/diagnostics.rs
+++ b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -352,13 +352,12 @@ impl<'a> Parser<'a> {
                             // if there is a `<` after the fn name, then don't show a suggestion, show help
 
                             if !self.look_ahead(1, |t| *t == token::Lt) &&
-                                let Ok(snippet) = self.sess.source_map().span_to_snippet(generic.span) &&
-                                let Ok(ident) = self.sess.source_map().span_to_snippet(self.token.span) {
+                                let Ok(snippet) = self.sess.source_map().span_to_snippet(generic.span) {
                                     err.span_suggestion_verbose(
                                         self.token.span.shrink_to_hi(),
                                         format!("place the generic parameter name after the {ident_name} name"),
                                         snippet,
-                                        Applicability::MachineApplicable,
+                                        Applicability::MaybeIncorrect,
                                     );
                                 } else {
                                     err.help(format!(
diff --git a/src/test/ui/parser/suggest_misplaced_generics/enum.stderr b/src/test/ui/parser/suggest_misplaced_generics/enum.stderr
index 521cee4f7289..8af94856a4a4 100644
--- a/src/test/ui/parser/suggest_misplaced_generics/enum.stderr
+++ b/src/test/ui/parser/suggest_misplaced_generics/enum.stderr
@@ -7,7 +7,7 @@ LL | enum<T> Foo { Variant(T) }
 help: place the generic parameter name after the enum name
    |
 LL | enum Foo<T> { Variant(T) }
-   |      ~~~~~~
+   |         ~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/suggest_misplaced_generics/fn-complex-generics.stderr b/src/test/ui/parser/suggest_misplaced_generics/fn-complex-generics.stderr
index 7d1b44c44944..196769cb2b56 100644
--- a/src/test/ui/parser/suggest_misplaced_generics/fn-complex-generics.stderr
+++ b/src/test/ui/parser/suggest_misplaced_generics/fn-complex-generics.stderr
@@ -7,7 +7,7 @@ LL | fn<'a, B: 'a + std::ops::Add<Output = u32>> f(_x: B) { }
 help: place the generic parameter name after the fn name
    |
 LL | fn f<'a, B: 'a + std::ops::Add<Output = u32>>(_x: B) { }
-   |    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/suggest_misplaced_generics/fn-simple.stderr b/src/test/ui/parser/suggest_misplaced_generics/fn-simple.stderr
index 40c4581e513a..0d09d8967b84 100644
--- a/src/test/ui/parser/suggest_misplaced_generics/fn-simple.stderr
+++ b/src/test/ui/parser/suggest_misplaced_generics/fn-simple.stderr
@@ -7,7 +7,7 @@ LL | fn<T> id(x: T) -> T { x }
 help: place the generic parameter name after the fn name
    |
 LL | fn id<T>(x: T) -> T { x }
-   |    ~~~~~
+   |      ~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/suggest_misplaced_generics/struct.stderr b/src/test/ui/parser/suggest_misplaced_generics/struct.stderr
index ab17ee57e0bc..32ffdb5e9c30 100644
--- a/src/test/ui/parser/suggest_misplaced_generics/struct.stderr
+++ b/src/test/ui/parser/suggest_misplaced_generics/struct.stderr
@@ -7,7 +7,7 @@ LL | struct<T> Foo { x: T }
 help: place the generic parameter name after the struct name
    |
 LL | struct Foo<T> { x: T }
-   |        ~~~~~~
+   |           ~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/suggest_misplaced_generics/trait.stderr b/src/test/ui/parser/suggest_misplaced_generics/trait.stderr
index 069683bda1be..01a31b7a85a9 100644
--- a/src/test/ui/parser/suggest_misplaced_generics/trait.stderr
+++ b/src/test/ui/parser/suggest_misplaced_generics/trait.stderr
@@ -7,7 +7,7 @@ LL | trait<T> Foo {
 help: place the generic parameter name after the trait name
    |
 LL | trait Foo<T> {
-   |       ~~~~~~
+   |          ~~~
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/suggest_misplaced_generics/type.stderr b/src/test/ui/parser/suggest_misplaced_generics/type.stderr
index a2832965c6d0..1ae73fae7f92 100644
--- a/src/test/ui/parser/suggest_misplaced_generics/type.stderr
+++ b/src/test/ui/parser/suggest_misplaced_generics/type.stderr
@@ -7,7 +7,7 @@ LL | type<T> Foo = T;
 help: place the generic parameter name after the type name
    |
 LL | type Foo<T> = T;
-   |      ~~~~~~
+   |         ~~~
 
 error: aborting due to previous error