bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix bad merge conflict resolution

Browse source
This commit is contained in:
Caleb Cartwright 2024-06-22 16:21:14 -05:00
parent 97b7874a3c
commit 53608bece0
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tools/rustfmt/src/parse/macros/lazy_static.rs
View file

@ -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);