Skip to content

Correct spans for fields in enum struct arms ... #12854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Correct spans for fields in enum struct arms ... #12854

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/libsyntax/parse/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2781,7 +2781,6 @@ impl<'a> Parser<'a> {
break;
}

let lo1 = self.last_span.lo;
let bind_type = if self.eat_keyword(keywords::Mut) {
BindByValue(MutMutable)
} else if self.eat_keyword(keywords::Ref) {
Expand All @@ -2791,11 +2790,8 @@ impl<'a> Parser<'a> {
};

let fieldname = self.parse_ident();
let hi1 = self.last_span.lo;
let fieldpath = ast_util::ident_to_path(mk_sp(lo1, hi1),
fieldname);
let subpat;
if self.token == token::COLON {

let subpat = if self.token == token::COLON {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could use self.eat(token::COLON) and remove the self.bump()

eat bumps the token if present

match bind_type {
BindByRef(..) | BindByValue(MutMutable) => {
let token_str = self.this_token_to_str();
Expand All @@ -2805,14 +2801,16 @@ impl<'a> Parser<'a> {
}

self.bump();
subpat = self.parse_pat();
self.parse_pat()
} else {
subpat = @ast::Pat {
let fieldpath = ast_util::ident_to_path(self.last_span,
fieldname);
@ast::Pat {
id: ast::DUMMY_NODE_ID,
node: PatIdent(bind_type, fieldpath, None),
span: self.last_span
};
}
}
};
fields.push(ast::FieldPat { ident: fieldname, pat: subpat });
}
return (fields, etc);
Expand Down