Tweak unexpected token wording

Author: estebank

src/libsyntax/parse/parser/diagnostics.rs

@@ -274,23 +274,23 @@ impl<'a> Parser<'a> {
         expected.sort_by_cached_key(|x| x.to_string());
         expected.dedup();
         let expect = tokens_to_string(&expected[..]);
-        let actual = self.this_token_to_string();
+        let actual = self.this_token_descr();
         let (msg_exp, (label_sp, label_exp)) = if expected.len() > 1 {
             let short_expect = if expected.len() > 6 {
                 format!("{} possible tokens", expected.len())
             } else {
                 expect.clone()
             };
-            (format!("expected one of {}, found `{}`", expect, actual),
+            (format!("expected one of {}, found {}", expect, actual),
                 (self.sess.source_map().next_point(self.prev_span),
                 format!("expected one of {} here", short_expect)))
         } else if expected.is_empty() {
-            (format!("unexpected token: `{}`", actual),
+            (format!("unexpected token: {}", actual),
                 (self.prev_span, "unexpected token after this".to_string()))
         } else {
-            (format!("expected {}, found `{}`", expect, actual),
+            (format!("expected {}, found {}", expect, actual),
                 (self.sess.source_map().next_point(self.prev_span),
-                format!("expected {} here", expect)))
+                format!("expected {}", expect)))
         };
         self.last_unexpected_token_span = Some(self.token.span);
         let mut err = self.fatal(&msg_exp);

src/test/ui/async-await/no-async-const.rs

@@ -3,4 +3,4 @@
 // compile-flags: --crate-type lib
 
 pub async const fn x() {}
-//~^ ERROR expected one of `fn` or `unsafe`, found `const`
+//~^ ERROR expected one of `fn` or `unsafe`, found keyword `const`

src/test/ui/async-await/no-async-const.stderr

@@ -1,4 +1,4 @@
-error: expected one of `fn` or `unsafe`, found `const`
+error: expected one of `fn` or `unsafe`, found keyword `const`
   --> $DIR/no-async-const.rs:5:11
    |
 LL | pub async const fn x() {}

src/test/ui/async-await/no-unsafe-async.rs

@@ -4,8 +4,8 @@ struct S;
 
 impl S {
     #[cfg(FALSE)]
-    unsafe async fn g() {} //~ ERROR expected one of `extern` or `fn`, found `async`
+    unsafe async fn g() {} //~ ERROR expected one of `extern` or `fn`, found keyword `async`
 }
 
 #[cfg(FALSE)]
-unsafe async fn f() {} //~ ERROR expected one of `extern`, `fn`, or `{`, found `async`
+unsafe async fn f() {} //~ ERROR expected one of `extern`, `fn`, or `{`, found keyword `async`

src/test/ui/async-await/no-unsafe-async.stderr

@@ -1,10 +1,10 @@
-error: expected one of `extern` or `fn`, found `async`
+error: expected one of `extern` or `fn`, found keyword `async`
   --> $DIR/no-unsafe-async.rs:7:12
    |
 LL |     unsafe async fn g() {}
    |            ^^^^^ expected one of `extern` or `fn` here
 
-error: expected one of `extern`, `fn`, or `{`, found `async`
+error: expected one of `extern`, `fn`, or `{`, found keyword `async`
   --> $DIR/no-unsafe-async.rs:11:8
    |
 LL | unsafe async fn f() {}

src/test/ui/can-begin-expr-check.rs

@@ -16,5 +16,5 @@ pub fn main() {
         return break as ();
     }
 
-    return enum; //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `enum`
+    return enum; //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found keyword `enum`
 }

src/test/ui/can-begin-expr-check.stderr

@@ -1,4 +1,4 @@
-error: expected one of `.`, `;`, `?`, `}`, or an operator, found `enum`
+error: expected one of `.`, `;`, `?`, `}`, or an operator, found keyword `enum`
   --> $DIR/can-begin-expr-check.rs:19:12
    |
 LL |     return enum;

src/test/ui/issues/issue-43196.stderr

@@ -2,7 +2,7 @@ error: expected `|`, found `}`
   --> $DIR/issue-43196.rs:3:1
    |
 LL |     |
-   |      - expected `|` here
+   |      - expected `|`
 LL | }
    | ^ unexpected token
 

src/test/ui/keyword/extern/keyword-extern-as-identifier-type.stderr

@@ -2,7 +2,7 @@ error: expected `fn`, found `::`
   --> $DIR/keyword-extern-as-identifier-type.rs:1:16
    |
 LL | type A = extern::foo::bar;
-   |                ^^ expected `fn` here
+   |                ^^ expected `fn`
 
 error: aborting due to previous error
 

src/test/ui/macros/issue-54441.stderr

@@ -1,4 +1,4 @@
-error: expected one of `crate`, `fn`, `pub`, `static`, or `type`, found `let`
+error: expected one of `crate`, `fn`, `pub`, `static`, or `type`, found keyword `let`
   --> $DIR/issue-54441.rs:3:9
    |
 LL |         let