From bb029cd29b8496e69ca625fabc3612e4c1fe9142 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 30 Dec 2018 18:38:44 +0100
Subject: [PATCH] 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 +++---
 .../ok/{0063_impl_item_neg.rs => 0063_impl_block_neg.rs}    | 0
 .../ok/{0063_impl_item_neg.txt => 0063_impl_block_neg.txt}  | 0
 .../inline/ok/{0079_impl_item.rs => 0079_impl_block.rs}     | 0
 .../inline/ok/{0079_impl_item.txt => 0079_impl_block.txt}   | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename crates/ra_syntax/tests/data/parser/inline/ok/{0063_impl_item_neg.rs => 0063_impl_block_neg.rs} (100%)
 rename crates/ra_syntax/tests/data/parser/inline/ok/{0063_impl_item_neg.txt => 0063_impl_block_neg.txt} (100%)
 rename crates/ra_syntax/tests/data/parser/inline/ok/{0079_impl_item.rs => 0079_impl_block.rs} (100%)
 rename crates/ra_syntax/tests/data/parser/inline/ok/{0079_impl_item.txt => 0079_impl_block.txt} (100%)

diff --git a/crates/ra_syntax/src/grammar/items.rs b/crates/ra_syntax/src/grammar/items.rs
index b9a00b565759..265e84570d51 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 d4da8b2f7237..0a0621753fc1 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_item_neg.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs
similarity index 100%
rename from crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.rs
rename to crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs
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_block_neg.txt
similarity index 100%
rename from crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_item_neg.txt
rename to crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.txt
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_block.rs
similarity index 100%
rename from crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.rs
rename to crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.rs
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_block.txt
similarity index 100%
rename from crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_item.txt
rename to crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.txt