Skip to content

Commit c7ddb83

Browse files
committed
Use expect_no_suffix for error
1 parent 6ad77b0 commit c7ddb83

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

src/libsyntax/parse/parser.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -3205,14 +3205,7 @@ impl<'a> Parser<'a> {
32053205
let field = ExprKind::Field(e, Ident::new(name, span));
32063206
e = self.mk_expr(lo.to(span), field, ThinVec::new());
32073207

3208-
if let Some(suffix) = suffix {
3209-
let mut err = self.diagnostic().struct_span_err(
3210-
span,
3211-
"suffixes on tuple indexes are invalid",
3212-
);
3213-
err.span_label(span, format!("invalid suffix `{}`", suffix));
3214-
err.emit();
3215-
}
3208+
self.expect_no_suffix(span, "tuple index", suffix);
32163209
}
32173210
token::Literal(token::Float(n), _suf) => {
32183211
self.bump();

src/test/ui/parser/issue-59418.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ struct X(i32,i32,i32);
33
fn main() {
44
let a = X(1, 2, 3);
55
let b = a.1suffix;
6-
//~^ ERROR suffixes on tuple indexes are invalid
6+
//~^ ERROR tuple index with a suffix is invalid
77
println!("{}", b);
88
let c = (1, 2, 3);
99
let d = c.1suffix;
10-
//~^ ERROR suffixes on tuple indexes are invalid
10+
//~^ ERROR tuple index with a suffix is invalid
1111
println!("{}", d);
1212
}
13-

src/test/ui/parser/issue-59418.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
error: suffixes on tuple indexes are invalid
1+
error: tuple index with a suffix is invalid
22
--> $DIR/issue-59418.rs:5:15
33
|
44
LL | let b = a.1suffix;
5-
| ^^^^^^^ invalid suffix `suffix`
5+
| ^^^^^^^ tuple index with a suffix is invalid
66

7-
error: suffixes on tuple indexes are invalid
7+
error: tuple index with a suffix is invalid
88
--> $DIR/issue-59418.rs:9:15
99
|
1010
LL | let d = c.1suffix;
11-
| ^^^^^^^ invalid suffix `suffix`
11+
| ^^^^^^^ tuple index with a suffix is invalid
1212

1313
error: aborting due to 2 previous errors
1414

0 commit comments

Comments
 (0)