Skip to content

Commit 6809ec1

Browse files
committed
Factor out seen_comma variable
1 parent 9c4ff56 commit 6809ec1

File tree

1 file changed

+3
-15
lines changed
  • compiler/rustc_parse/src/parser

1 file changed

+3
-15
lines changed

compiler/rustc_parse/src/parser/item.rs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1916,11 +1916,7 @@ impl<'a> Parser<'a> {
19161916
safety: Safety,
19171917
attrs: AttrVec,
19181918
) -> PResult<'a, FieldDef> {
1919-
let mut seen_comma: bool = false;
19201919
let a_var = self.parse_name_and_ty(adt_ty, lo, vis, safety, attrs)?;
1921-
if self.token == token::Comma {
1922-
seen_comma = true;
1923-
}
19241920
if self.eat(exp!(Semi)) {
19251921
let sp = self.prev_token.span;
19261922
let mut err =
@@ -1945,19 +1941,11 @@ impl<'a> Parser<'a> {
19451941
missing_comma: None,
19461942
};
19471943
self.bump(); // consume the doc comment
1948-
let comma_after_doc_seen = self.eat(exp!(Comma));
1949-
// `seen_comma` is always false, because we are inside doc block
1950-
// condition is here to make code more readable
1951-
if !seen_comma && comma_after_doc_seen {
1952-
seen_comma = true;
1953-
}
1954-
if comma_after_doc_seen || self.token == token::CloseBrace {
1944+
if self.eat(exp!(Comma)) || self.token == token::CloseBrace {
19551945
self.dcx().emit_err(err);
19561946
} else {
1957-
if !seen_comma {
1958-
let sp = previous_span.shrink_to_hi();
1959-
err.missing_comma = Some(sp);
1960-
}
1947+
let sp = previous_span.shrink_to_hi();
1948+
err.missing_comma = Some(sp);
19611949
return Err(self.dcx().create_err(err));
19621950
}
19631951
}

0 commit comments

Comments
 (0)