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

refactor lifetime out of is_lifetime

Browse source
This commit is contained in:
Matt Peterson 2017-12-30 21:47:45 -05:00
parent f55242583c
commit 8b4bdc2f3f
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libsyntax/parse/parser.rs
View file

@ -2036,19 +2036,12 @@ impl<'a> Parser<'a> {
/// Parse single lifetime 'a or panic.
pub fn expect_lifetime(&mut self) -> Lifetime {
let lifetime = match self.token {
token::Lifetime(ident) =>
Lifetime { ident: ident, span: self.span, id: ast::DUMMY_NODE_ID },
token::Interpolated(ref nt) => match nt.0 {
token::NtLifetime(lifetime) =>
lifetime,
_ => self.span_bug(self.span, "not a lifetime")
}
_ => self.span_bug(self.span, "not a lifetime")
};
self.bump();
lifetime
if let Some(lifetime) = self.token.lifetime(self.span) {
self.bump();
lifetime
} else {
self.span_bug(self.span, "not a lifetime")
}
}
/// Parse mutability (`mut` or nothing).