bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

parse_angle_arg: parse constraints first

Browse source
This commit is contained in:
Mazdak Farrokhzad 2020-03-22 05:01:38 +01:00
parent abce4881e0
commit aa4999ec69
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc_parse/parser/path.rs
View file

@ -399,10 +399,7 @@ impl<'a> Parser<'a> {
/// Parses a single argument in the angle arguments `<...>` of a path segment.
fn parse_angle_arg(&mut self) -> PResult<'a, Option<AngleBracketedArg>> {
let arg = if self.check_lifetime() && self.look_ahead(1, |t| !t.is_like_plus()) {
// Parse lifetime argument.
AngleBracketedArg::Arg(GenericArg::Lifetime(self.expect_lifetime()))
} else if self.check_ident()
let arg = if self.check_ident()
&& self.look_ahead(1, |t| matches!(t.kind, token::Eq | token::Colon))
{
// Parse associated type constraint.
@ -426,6 +423,9 @@ impl<'a> Parser<'a> {
let constraint = AssocTyConstraint { id: ast::DUMMY_NODE_ID, ident, kind, span };
AngleBracketedArg::Constraint(constraint)
} else if self.check_lifetime() && self.look_ahead(1, |t| !t.is_like_plus()) {
// Parse lifetime argument.
AngleBracketedArg::Arg(GenericArg::Lifetime(self.expect_lifetime()))
} else if self.check_const_arg() {
// Parse const argument.
let expr = if let token::OpenDelim(token::Brace) = self.token.kind {