Skip to content

Commit

Permalink
fix bad merge conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
calebcartwright committed Jun 22, 2024
1 parent 8b36bc0 commit 081ae53
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/parse/macros/lazy_static.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ pub(crate) fn parse_lazy_static(
Err(err) => {
err.cancel();
parser.psess.dcx().reset_err_count();
return None;
}

}
}
}
while parser.token.kind != TokenKind::Eof {
// Parse a `lazy_static!` item.
let vis = parse_or!(parse_visibility, rustc_parse::parser::FollowedByType::No);
Expand Down

0 comments on commit 081ae53

Please sign in to comment.