From bb029cd29b8496e69ca625fabc3612e4c1fe9142 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 30 Dec 2018 18:38:44 +0100 Subject: Rename traits::impl_item -> impl_block as well, as well as the tests --- crates/ra_syntax/src/grammar/items.rs | 2 +- crates/ra_syntax/src/grammar/items/traits.rs | 6 +++--- .../data/parser/inline/ok/0063_impl_block_neg.rs | 1 + .../data/parser/inline/ok/0063_impl_block_neg.txt | 23 ++++++++++++++++++++++ .../data/parser/inline/ok/0063_impl_item_neg.rs | 1 - .../data/parser/inline/ok/0063_impl_item_neg.txt | 23 ---------------------- .../tests/data/parser/inline/ok/0079_impl_block.rs | 1 + .../data/parser/inline/ok/0079_impl_block.txt | 14 +++++++++++++ .../tests/data/parser/inline/ok/0079_impl_item.rs | 1 - .../tests/data/parser/inline/ok/0079_impl_item.txt | 14 ------------- 10 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs create mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.txt delete mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.rs delete mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt create mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.rs create mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.txt delete mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.rs delete mode 100644 crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt (limited to 'crates/ra_syntax') diff --git a/crates/ra_syntax/src/grammar/items.rs b/crates/ra_syntax/src/grammar/items.rs index b9a00b565..265e84570 100644 --- a/crates/ra_syntax/src/grammar/items.rs +++ b/crates/ra_syntax/src/grammar/items.rs @@ -151,7 +151,7 @@ pub(super) fn maybe_item(p: &mut Parser, flavor: ItemFlavor) -> MaybeItem { // test unsafe_default_impl // unsafe default impl Foo {} IMPL_KW => { - traits::impl_item(p); + traits::impl_block(p); IMPL_BLOCK } _ => { diff --git a/crates/ra_syntax/src/grammar/items/traits.rs b/crates/ra_syntax/src/grammar/items/traits.rs index d4da8b2f7..0a0621753 100644 --- a/crates/ra_syntax/src/grammar/items/traits.rs +++ b/crates/ra_syntax/src/grammar/items/traits.rs @@ -40,9 +40,9 @@ pub(crate) fn trait_item_list(p: &mut Parser) { m.complete(p, ITEM_LIST); } -// test impl_item +// test impl_block // impl Foo {} -pub(super) fn impl_item(p: &mut Parser) { +pub(super) fn impl_block(p: &mut Parser) { assert!(p.at(IMPL_KW)); p.bump(); if choose_type_params_over_qpath(p) { @@ -52,7 +52,7 @@ pub(super) fn impl_item(p: &mut Parser) { // TODO: never type // impl ! {} - // test impl_item_neg + // test impl_block_neg // impl !Send for X {} p.eat(EXCL); impl_type(p); diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs new file mode 100644 index 000000000..b7527c870 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs @@ -0,0 +1 @@ +impl !Send for X {} diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.txt new file mode 100644 index 000000000..563e43508 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.txt @@ -0,0 +1,23 @@ +SOURCE_FILE@[0; 20) + IMPL_BLOCK@[0; 19) + IMPL_KW@[0; 4) + WHITESPACE@[4; 5) + EXCL@[5; 6) + PATH_TYPE@[6; 10) + PATH@[6; 10) + PATH_SEGMENT@[6; 10) + NAME_REF@[6; 10) + IDENT@[6; 10) "Send" + WHITESPACE@[10; 11) + FOR_KW@[11; 14) + WHITESPACE@[14; 15) + PATH_TYPE@[15; 16) + PATH@[15; 16) + PATH_SEGMENT@[15; 16) + NAME_REF@[15; 16) + IDENT@[15; 16) "X" + WHITESPACE@[16; 17) + ITEM_LIST@[17; 19) + L_CURLY@[17; 18) + R_CURLY@[18; 19) + WHITESPACE@[19; 20) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.rs deleted file mode 100644 index b7527c870..000000000 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.rs +++ /dev/null @@ -1 +0,0 @@ -impl !Send for X {} diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt deleted file mode 100644 index 563e43508..000000000 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt +++ /dev/null @@ -1,23 +0,0 @@ -SOURCE_FILE@[0; 20) - IMPL_BLOCK@[0; 19) - IMPL_KW@[0; 4) - WHITESPACE@[4; 5) - EXCL@[5; 6) - PATH_TYPE@[6; 10) - PATH@[6; 10) - PATH_SEGMENT@[6; 10) - NAME_REF@[6; 10) - IDENT@[6; 10) "Send" - WHITESPACE@[10; 11) - FOR_KW@[11; 14) - WHITESPACE@[14; 15) - PATH_TYPE@[15; 16) - PATH@[15; 16) - PATH_SEGMENT@[15; 16) - NAME_REF@[15; 16) - IDENT@[15; 16) "X" - WHITESPACE@[16; 17) - ITEM_LIST@[17; 19) - L_CURLY@[17; 18) - R_CURLY@[18; 19) - WHITESPACE@[19; 20) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.rs new file mode 100644 index 000000000..d6337f6b3 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.rs @@ -0,0 +1 @@ +impl Foo {} diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.txt new file mode 100644 index 000000000..a2c218aa9 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.txt @@ -0,0 +1,14 @@ +SOURCE_FILE@[0; 12) + IMPL_BLOCK@[0; 11) + IMPL_KW@[0; 4) + WHITESPACE@[4; 5) + PATH_TYPE@[5; 8) + PATH@[5; 8) + PATH_SEGMENT@[5; 8) + NAME_REF@[5; 8) + IDENT@[5; 8) "Foo" + WHITESPACE@[8; 9) + ITEM_LIST@[9; 11) + L_CURLY@[9; 10) + R_CURLY@[10; 11) + WHITESPACE@[11; 12) diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.rs deleted file mode 100644 index d6337f6b3..000000000 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.rs +++ /dev/null @@ -1 +0,0 @@ -impl Foo {} diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt deleted file mode 100644 index a2c218aa9..000000000 --- a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt +++ /dev/null @@ -1,14 +0,0 @@ -SOURCE_FILE@[0; 12) - IMPL_BLOCK@[0; 11) - IMPL_KW@[0; 4) - WHITESPACE@[4; 5) - PATH_TYPE@[5; 8) - PATH@[5; 8) - PATH_SEGMENT@[5; 8) - NAME_REF@[5; 8) - IDENT@[5; 8) "Foo" - WHITESPACE@[8; 9) - ITEM_LIST@[9; 11) - L_CURLY@[9; 10) - R_CURLY@[10; 11) - WHITESPACE@[11; 12) -- cgit v1.2.3