Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-28 12:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1794

Browse source 
1794: tiny simplification r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-09-09 10:24:27 +00:00 committed by GitHub
commit 76f39b4b20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_parser/src/grammar.rs
View file

@ -125,7 +125,7 @@ pub(crate) mod fragments {
let m = p.start(); let m = p.start();
while !p.at(EOF) { while !p.at(EOF) {
if p.current() == T![;] { if p.at(T![;]) {
p.bump(); p.bump();
continue; continue;
} }

2
crates/ra_parser/src/grammar/attributes.rs
View file

@ -1,7 +1,7 @@
use super::*; use super::*;
pub(super) fn inner_attributes(p: &mut Parser) { pub(super) fn inner_attributes(p: &mut Parser) {
while p.current() == T![#] && p.nth(1) == T![!] { while p.at(T![#]) && p.nth(1) == T![!] {
attribute(p, true) attribute(p, true)
} }
} }

4
crates/ra_parser/src/grammar/expressions.rs
View file

@ -197,7 +197,7 @@ pub(crate) fn expr_block_contents(p: &mut Parser) {
// struct S {}; // struct S {};
// } // }
if p.current() == T![;] { if p.at(T![;]) {
p.bump(); p.bump();
continue; continue;
} }
@ -302,7 +302,7 @@ fn expr_bp(
newly_dollar_open = false; newly_dollar_open = false;
} }
let is_range = p.current() == T![..] || p.current() == T![..=]; let is_range = p.at(T![..]) || p.at(T![..=]);
let (op_bp, op) = current_op(p); let (op_bp, op) = current_op(p);
if op_bp < bp { if op_bp < bp {
break; break;

5
crates/ra_parser/src/grammar/type_params.rs
View file

@ -156,7 +156,10 @@ fn is_where_predicate(p: &mut Parser) -> bool {
} }
fn is_where_clause_end(p: &mut Parser) -> bool { fn is_where_clause_end(p: &mut Parser) -> bool {
p.current() == T!['{'] || p.current() == T![;] || p.current() == T![=] match p.current() {
T!['{'] | T![;] | T![=] => true,
_ => false,
}
} }
fn where_predicate(p: &mut Parser) { fn where_predicate(p: &mut Parser) {