diff options
| author | Caleb Cartwright <caleb.cartwright@outlook.com> | 2024-06-22 16:21:14 -0500 |
|---|---|---|
| committer | Caleb Cartwright <caleb.cartwright@outlook.com> | 2024-06-22 16:21:14 -0500 |
| commit | 081ae53225a9620e5e133608e7d937f1a051aff4 (patch) | |
| tree | 0ff8298c9ff4d3e3f6a887316f3c96e2b22dcb34 | |
| parent | 8b36bc00a8b44487d0fafeff6041c138f2025835 (diff) | |
| download | rust-081ae53225a9620e5e133608e7d937f1a051aff4.tar.gz rust-081ae53225a9620e5e133608e7d937f1a051aff4.zip | |
fix bad merge conflict resolution
| -rw-r--r-- | src/parse/macros/lazy_static.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/parse/macros/lazy_static.rs b/src/parse/macros/lazy_static.rs index d4f51a4c74d..7baac247e22 100644 --- a/src/parse/macros/lazy_static.rs +++ b/src/parse/macros/lazy_static.rs @@ -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); |