diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-30 12:21:18 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-30 12:21:18 +0000 |
commit | 9ebd14a14e20aebc8e176a8dcb22376eb3a4d73e (patch) | |
tree | fe4ac6c30c35da765b91eb94f552c18278c35459 /crates/ra_parser | |
parent | c4dfced1f85a68c77e65ac6753603c6d14c49599 (diff) | |
parent | 444a119220b8fe2c5ddf996b2a00cb67e375587d (diff) |
Merge #1075
1075: Fix parsing <= in type_args r=matklad a=vipentti
Fixes #1074
Co-authored-by: Ville Penttinen <[email protected]>
Diffstat (limited to 'crates/ra_parser')
-rw-r--r-- | crates/ra_parser/src/grammar/expressions.rs | 1 | ||||
-rw-r--r-- | crates/ra_parser/src/grammar/type_args.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs index 73e1acd5a..bf5d6544d 100644 --- a/crates/ra_parser/src/grammar/expressions.rs +++ b/crates/ra_parser/src/grammar/expressions.rs | |||
@@ -410,6 +410,7 @@ fn try_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | |||
410 | // 82 as i32; | 410 | // 82 as i32; |
411 | // 81 as i8 + 1; | 411 | // 81 as i8 + 1; |
412 | // 79 as i16 - 1; | 412 | // 79 as i16 - 1; |
413 | // 0x36 as u8 <= 0x37; | ||
413 | // } | 414 | // } |
414 | fn cast_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { | 415 | fn cast_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker { |
415 | assert!(p.at(AS_KW)); | 416 | assert!(p.at(AS_KW)); |
diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs index f889419c5..684976b99 100644 --- a/crates/ra_parser/src/grammar/type_args.rs +++ b/crates/ra_parser/src/grammar/type_args.rs | |||
@@ -8,6 +8,7 @@ pub(super) fn opt_type_arg_list(p: &mut Parser, colon_colon_required: bool) { | |||
8 | p.bump(); | 8 | p.bump(); |
9 | p.bump(); | 9 | p.bump(); |
10 | } | 10 | } |
11 | (false, L_ANGLE, EQ) => return, | ||
11 | (false, L_ANGLE, _) => { | 12 | (false, L_ANGLE, _) => { |
12 | m = p.start(); | 13 | m = p.start(); |
13 | p.bump(); | 14 | p.bump(); |