language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix parser tests according to review

Browse source
This commit is contained in:
Evgenii P 2019-08-08 09:12:07 +07:00
parent 77f4ab3e9b
commit 6fa2d82147
19 changed files with 580 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_parser/src/grammar/params.rs
View file

@ -5,15 +5,12 @@ use super::*;
// fn b(x: i32) {}
// fn c(x: i32, ) {}
// fn d(x: i32, y: ()) {}
// fn g1(#[attr1] #[attr2] pat: Type) {}
// fn g2(#[attr1] x: u8) {}
pub(super) fn param_list(p: &mut Parser) {
list_(p, Flavor::Normal)
}
// test param_list_opt_patterns
// fn foo<F: FnMut(&mut Foo<'a>)>(){}
// fn foo<F: FnMut(#[attr] &mut Foo<'a>)>(){}
pub(super) fn param_list_opt_patterns(p: &mut Parser) {
list_(p, Flavor::OptionalPattern)
}
@ -44,10 +41,14 @@ fn list_(p: &mut Parser, flavor: Flavor) {
let m = p.start();
p.bump();
if flavor.type_required() {
// test self_param_outer_attr
// fn f(#[must_use] self) {}
attributes::outer_attributes(p);
opt_self_param(p);
}
while !p.at(EOF) && !p.at(ket) {
// test param_outer_arg
// fn f(#[attr1] pat: Type) {}
attributes::outer_attributes(p);
if flavor.type_required() && p.at(T![...]) {
@ -65,7 +66,6 @@ fn list_(p: &mut Parser, flavor: Flavor) {
}
// test param_list_vararg
// extern "C" { fn printf(format: *const i8, ...) -> i32; }
// extern "C" { fn printf(format: *const i8, #[attr] ...) -> i32; }
if flavor.type_required() {
p.eat(T![...]);
}
@ -95,7 +95,6 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) {
// test trait_fn_placeholder_parameter
// trait Foo {
// fn bar(_: u64, mut x: i32);
// fn bar(#[attr] _: u64, #[attr] mut x: i32);
// }
if (la0 == IDENT || la0 == T![_]) && la1 == T![:]
|| la0 == T![mut] && la1 == IDENT && la2 == T![:]
@ -119,12 +118,6 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) {
// fn c(&'a self,) {}
// fn d(&'a mut self, x: i32) {}
// fn e(mut self) {}
// fn f(#[must_use] self) {}
// fn g1(#[attr] self) {}
// fn g2(#[attr] &self) {}
// fn g3<'a>(#[attr] &mut self) {}
// fn g4<'a>(#[attr] &'a self) {}
// fn g5<'a>(#[attr] &'a mut self) {}
// }
fn opt_self_param(p: &mut Parser) {
let m;
@ -136,8 +129,6 @@ fn opt_self_param(p: &mut Parser) {
// impl S {
// fn a(self: &Self) {}
// fn b(mut self: Box<Self>) {}
// fn c(#[attr] self: Self) {}
// fn d(#[attr] self: Rc<Self>) {}
// }
if p.at(T![:]) {
types::ascription(p);