bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Clean up span in non-trailing .. suggestion

Browse source
This commit is contained in:
Esteban Küber 2018-11-28 16:05:02 -08:00
parent 423291f14b
commit 66a2c39290
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/parse/parser.rs
View file

@ -3956,7 +3956,7 @@ impl<'a> Parser<'a> {
);
err.emit();
}
self.bump(); // `..` || `...`:w
self.bump(); // `..` || `...`
if self.token == token::CloseDelim(token::Brace) {
etc_span = Some(etc_sp);
@ -3976,7 +3976,7 @@ impl<'a> Parser<'a> {
ate_comma = true;
}
etc_span = Some(etc_sp);
etc_span = Some(etc_sp.until(self.span));
if self.token == token::CloseDelim(token::Brace) {
// If the struct looks otherwise well formed, recover and continue.
if let Some(sp) = comma_sp {

8
src/test/ui/issues/issue-49257.stderr
View file

@ -8,8 +8,8 @@ LL | let Point { .., y, } = p; //~ ERROR expected `}`, found `,`
| `..` must be at the end and cannot have a trailing comma
help: move the `..` to the end of the field list
|
LL | let Point { y, .. } = p; //~ ERROR expected `}`, found `,`
| -- ^^^^
LL | let Point { y, .. } = p; //~ ERROR expected `}`, found `,`
| -- ^^^^
error: expected `}`, found `,`
--> $DIR/issue-49257.rs:21:19
@ -21,8 +21,8 @@ LL | let Point { .., y } = p; //~ ERROR expected `}`, found `,`
| `..` must be at the end and cannot have a trailing comma
help: move the `..` to the end of the field list
|
LL | let Point { y , .. } = p; //~ ERROR expected `}`, found `,`
| -- ^^^^^^
LL | let Point { y , .. } = p; //~ ERROR expected `}`, found `,`
| -- ^^^^^^
error: expected `}`, found `,`
--> $DIR/issue-49257.rs:22:19