nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-28 17:53:56 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats 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(err) => {
err.cancel(); err.cancel();
parser.psess.dcx().reset_err_count(); parser.psess.dcx().reset_err_count();
return None;
} }
}
}
}
while parser.token.kind != TokenKind::Eof { while parser.token.kind != TokenKind::Eof {
// Parse a `lazy_static!` item. // Parse a `lazy_static!` item.
let vis = parse_or!(parse_visibility, rustc_parse::parser::FollowedByType::No); let vis = parse_or!(parse_visibility, rustc_parse::parser::FollowedByType::No);