From c7ddb83980a89118937c8f9c264183f5abf73339 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Tue, 26 Mar 2019 10:18:18 -0700
Subject: [PATCH] Use `expect_no_suffix` for error

---
 src/libsyntax/parse/parser.rs         | 9 +--------
 src/test/ui/parser/issue-59418.rs     | 5 ++---
 src/test/ui/parser/issue-59418.stderr | 8 ++++----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 38647bec982..8dacb270637 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3205,14 +3205,7 @@ fn parse_dot_or_call_expr_with_(&mut self, e0: P<Expr>, lo: Span) -> PResult<'a,
                         let field = ExprKind::Field(e, Ident::new(name, span));
                         e = self.mk_expr(lo.to(span), field, ThinVec::new());
 
-                        if let Some(suffix) = suffix {
-                            let mut err = self.diagnostic().struct_span_err(
-                                span,
-                                "suffixes on tuple indexes are invalid",
-                            );
-                            err.span_label(span, format!("invalid suffix `{}`", suffix));
-                            err.emit();
-                        }
+                        self.expect_no_suffix(span, "tuple index", suffix);
                     }
                     token::Literal(token::Float(n), _suf) => {
                       self.bump();
diff --git a/src/test/ui/parser/issue-59418.rs b/src/test/ui/parser/issue-59418.rs
index cab37e0d809..d1afa6af320 100644
--- a/src/test/ui/parser/issue-59418.rs
+++ b/src/test/ui/parser/issue-59418.rs
@@ -3,11 +3,10 @@
 fn main() {
     let a = X(1, 2, 3);
     let b = a.1suffix;
-    //~^ ERROR suffixes on tuple indexes are invalid
+    //~^ ERROR tuple index with a suffix is invalid
     println!("{}", b);
     let c = (1, 2, 3);
     let d = c.1suffix;
-    //~^ ERROR suffixes on tuple indexes are invalid
+    //~^ ERROR tuple index with a suffix is invalid
     println!("{}", d);
 }
-
diff --git a/src/test/ui/parser/issue-59418.stderr b/src/test/ui/parser/issue-59418.stderr
index e50780de4f9..4ca4bd73abc 100644
--- a/src/test/ui/parser/issue-59418.stderr
+++ b/src/test/ui/parser/issue-59418.stderr
@@ -1,14 +1,14 @@
-error: suffixes on tuple indexes are invalid
+error: tuple index with a suffix is invalid
   --> $DIR/issue-59418.rs:5:15
    |
 LL |     let b = a.1suffix;
-   |               ^^^^^^^ invalid suffix `suffix`
+   |               ^^^^^^^ tuple index with a suffix is invalid
 
-error: suffixes on tuple indexes are invalid
+error: tuple index with a suffix is invalid
   --> $DIR/issue-59418.rs:9:15
    |
 LL |     let d = c.1suffix;
-   |               ^^^^^^^ invalid suffix `suffix`
+   |               ^^^^^^^ tuple index with a suffix is invalid
 
 error: aborting due to 2 previous errors
 
-- 
2.44.0