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

Optional patterns in trait methods

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-13 18:40:47 +03:00
parent c146331b1c
commit 7d0c9cf546
4 changed files with 92 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/libsyntax2/src/grammar/expressions/atom.rs
View file

@ -284,7 +284,7 @@ pub(super) fn block_expr(p: &mut Parser) -> CompletedMarker {
// test block_items
// fn a() { fn b() {} }
let m = p.start();
match items::maybe_item(p) {
match items::maybe_item(p, items::ItemFlavor::Mod) {
items::MaybeItem::Item(kind) => {
m.complete(p, kind);
}

23
crates/libsyntax2/src/grammar/items/mod.rs
View file

@ -14,13 +14,17 @@ mod use_item;
pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
attributes::inner_attributes(p);
while !p.at(EOF) && !(stop_on_r_curly && p.at(R_CURLY)) {
item_or_macro(p, stop_on_r_curly)
item_or_macro(p, stop_on_r_curly, ItemFlavor::Mod)
}
}
pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) {
pub(super) enum ItemFlavor {
Mod, Trait
}
pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool, flavor: ItemFlavor) {
let m = p.start();
match maybe_item(p) {
match maybe_item(p, flavor) {
MaybeItem::Item(kind) => {
m.complete(p, kind);
}
@ -60,7 +64,7 @@ pub(super) enum MaybeItem {
Modifiers,
}
pub(super) fn maybe_item(p: &mut Parser) -> MaybeItem {
pub(super) fn maybe_item(p: &mut Parser, flavor: ItemFlavor) -> MaybeItem {
attributes::outer_attributes(p);
visibility(p);
if let Some(kind) = items_without_modifiers(p) {
@ -107,7 +111,7 @@ pub(super) fn maybe_item(p: &mut Parser) -> MaybeItem {
// test unsafe_fn
// unsafe fn foo() {}
FN_KW => {
function(p);
function(p, flavor);
FN_DEF
}
@ -217,7 +221,7 @@ fn extern_block(p: &mut Parser) {
p.expect(R_CURLY);
}
fn function(p: &mut Parser) {
fn function(p: &mut Parser, flavor: ItemFlavor) {
assert!(p.at(FN_KW));
p.bump();
@ -227,7 +231,12 @@ fn function(p: &mut Parser) {
type_params::type_param_list(p);
if p.at(L_PAREN) {
params::param_list(p);
match flavor {
ItemFlavor::Mod =>
params::param_list(p),
ItemFlavor::Trait =>
params::param_list_opt_patterns(p),
}
} else {
p.error("expected function arguments");
}

4
crates/libsyntax2/src/grammar/items/traits.rs
View file

@ -20,7 +20,7 @@ pub(super) fn trait_def(p: &mut Parser) {
// fn bar(&self);
// }
while !p.at(EOF) && !p.at(R_CURLY) {
item_or_macro(p, true);
item_or_macro(p, true, ItemFlavor::Trait);
}
p.expect(R_CURLY);
}
@ -55,7 +55,7 @@ pub(super) fn impl_item(p: &mut Parser) {
// fn bar(&self) {}
// }
while !p.at(EOF) && !p.at(R_CURLY) {
item_or_macro(p, true);
item_or_macro(p, true, ItemFlavor::Mod);
}
p.expect(R_CURLY);
}