bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #119359 - DaniPopes:ident-or-err, r=compiler-errors

Browse source 
Simplify Parser::ident_or_error

Avoid a nested `Result<T, PResult<T>>`.
This commit is contained in:
Matthias Krüger 2023-12-28 18:48:01 +01:00 • committed by GitHub
commit 54bcb07ab1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_parse/src/parser/mod.rs
View file

@ -504,18 +504,10 @@ impl<'a> Parser<'a> {
} }
fn ident_or_err(&mut self, recover: bool) -> PResult<'a, (Ident, /* is_raw */ bool)> { fn ident_or_err(&mut self, recover: bool) -> PResult<'a, (Ident, /* is_raw */ bool)> {
let result = self.token.ident().ok_or_else(|| self.expected_ident_found(recover)); match self.token.ident() {
Some(ident) => Ok(ident),
let (ident, is_raw) = match result { None => self.expected_ident_found(recover),
Ok(ident) => ident, }
Err(err) => match err {
// we recovered!
Ok(ident) => ident,
Err(err) => return Err(err),
},
};
Ok((ident, is_raw))
} }
/// Checks if the next token is `tok`, and returns `true` if so. /// Checks if the next token is `tok`, and returns `true` if so.