Merge #5587

5587: Finish use grammar r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

23 files changed, 148 insertions, 146 deletions

diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 2e958fa23..6ebe10ff6 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -262,9 +262,9 @@ impl ast::PathSegment {
     }
 }
 
-impl ast::UseItem {
+impl ast::Use {
     #[must_use]
-    pub fn with_use_tree(&self, use_tree: ast::UseTree) -> ast::UseItem {
+    pub fn with_use_tree(&self, use_tree: ast::UseTree) -> ast::Use {
         if let Some(old) = self.use_tree() {
             return self.replace_descendant(old, use_tree);
         }
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 3fd761367..be657699f 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -213,12 +213,12 @@ impl UnionDef {
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UseItem {
+pub struct Use {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for UseItem {}
-impl ast::VisibilityOwner for UseItem {}
-impl UseItem {
+impl ast::AttrsOwner for Use {}
+impl ast::VisibilityOwner for Use {}
+impl Use {
     pub fn use_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![use]) }
     pub fn use_tree(&self) -> Option<UseTree> { support::child(&self.syntax) }
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
@@ -268,6 +268,36 @@ pub struct Rename {
 impl ast::NameOwner for Rename {}
 impl Rename {
     pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct UseTree {
+    pub(crate) syntax: SyntaxNode,
+}
+impl UseTree {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
+    pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }
+    pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Path {
+    pub(crate) syntax: SyntaxNode,
+}
+impl Path {
+    pub fn qualifier(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn segment(&self) -> Option<PathSegment> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct UseTreeList {
+    pub(crate) syntax: SyntaxNode,
+}
+impl UseTreeList {
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn use_trees(&self) -> AstChildren<UseTree> { support::children(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Abi {
@@ -433,15 +463,6 @@ impl PathType {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Path {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Path {
-    pub fn qualifier(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
-    pub fn segment(&self) -> Option<PathSegment> { support::child(&self.syntax) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PointerType {
     pub(crate) syntax: SyntaxNode,
 }
@@ -1178,26 +1199,6 @@ impl Param {
     pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UseTree {
-    pub(crate) syntax: SyntaxNode,
-}
-impl UseTree {
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
-    pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
-    pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }
-    pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UseTreeList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl UseTreeList {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn use_trees(&self) -> AstChildren<UseTree> { support::children(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathSegment {
     pub(crate) syntax: SyntaxNode,
 }
@@ -1282,7 +1283,7 @@ pub enum Item {
     TraitDef(TraitDef),
     TypeAliasDef(TypeAliasDef),
     UnionDef(UnionDef),
-    UseItem(UseItem),
+    Use(Use),
 }
 impl ast::AttrsOwner for Item {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1561,8 +1562,8 @@ impl AstNode for UnionDef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for UseItem {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_ITEM }
+impl AstNode for Use {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == USE }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1627,6 +1628,39 @@ impl AstNode for Rename {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
+impl AstNode for UseTree {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for Path {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for UseTreeList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE_LIST }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
 impl AstNode for Abi {
     fn can_cast(kind: SyntaxKind) -> bool { kind == ABI }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -1825,17 +1859,6 @@ impl AstNode for PathType {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Path {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for PointerType {
     fn can_cast(kind: SyntaxKind) -> bool { kind == POINTER_TYPE }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2672,28 +2695,6 @@ impl AstNode for Param {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for UseTree {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
-impl AstNode for UseTreeList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE_LIST }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for PathSegment {
     fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_SEGMENT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2810,15 +2811,16 @@ impl From<TypeAliasDef> for Item {
 impl From<UnionDef> for Item {
     fn from(node: UnionDef) -> Item { Item::UnionDef(node) }
 }
-impl From<UseItem> for Item {
-    fn from(node: UseItem) -> Item { Item::UseItem(node) }
+impl From<Use> for Item {
+    fn from(node: Use) -> Item { Item::Use(node) }
 }
 impl AstNode for Item {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
             CONST_DEF | ENUM_DEF | EXTERN_BLOCK | EXTERN_CRATE | FN_DEF | IMPL_DEF | MACRO_CALL
-            | MODULE | STATIC_DEF | STRUCT_DEF | TRAIT_DEF | TYPE_ALIAS_DEF | UNION_DEF
-            | USE_ITEM => true,
+            | MODULE | STATIC_DEF | STRUCT_DEF | TRAIT_DEF | TYPE_ALIAS_DEF | UNION_DEF | USE => {
+                true
+            }
             _ => false,
         }
     }
@@ -2837,7 +2839,7 @@ impl AstNode for Item {
             TRAIT_DEF => Item::TraitDef(TraitDef { syntax }),
             TYPE_ALIAS_DEF => Item::TypeAliasDef(TypeAliasDef { syntax }),
             UNION_DEF => Item::UnionDef(UnionDef { syntax }),
-            USE_ITEM => Item::UseItem(UseItem { syntax }),
+            USE => Item::Use(Use { syntax }),
             _ => return None,
         };
         Some(res)
@@ -2857,7 +2859,7 @@ impl AstNode for Item {
             Item::TraitDef(it) => &it.syntax,
             Item::TypeAliasDef(it) => &it.syntax,
             Item::UnionDef(it) => &it.syntax,
-            Item::UseItem(it) => &it.syntax,
+            Item::Use(it) => &it.syntax,
         }
     }
 }
@@ -3530,7 +3532,7 @@ impl std::fmt::Display for UnionDef {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for UseItem {
+impl std::fmt::Display for Use {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3560,6 +3562,21 @@ impl std::fmt::Display for Rename {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
+impl std::fmt::Display for UseTree {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
+impl std::fmt::Display for Path {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
+impl std::fmt::Display for UseTreeList {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
 impl std::fmt::Display for Abi {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -3650,11 +3667,6 @@ impl std::fmt::Display for PathType {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Path {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for PointerType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -4035,16 +4047,6 @@ impl std::fmt::Display for Param {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for UseTree {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl std::fmt::Display for UseTreeList {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for PathSegment {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index 2b05ed2d4..0ff69bc2d 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -60,7 +60,7 @@ pub fn use_tree_list(use_trees: impl IntoIterator<Item = ast::UseTree>) -> ast::
     ast_from_text(&format!("use {{{}}};", use_trees))
 }
 
-pub fn use_item(use_tree: ast::UseTree) -> ast::UseItem {
+pub fn use_item(use_tree: ast::UseTree) -> ast::Use {
     ast_from_text(&format!("use {};", use_tree))
 }
 
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
index 6717995e9..4cfd1bce4 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
@@ -6,7 +6,7 @@ [email protected]
     [email protected] "!"
   [email protected]
     [email protected] "/"
-  USE_ITEM@24..28
+  [email protected]
     [email protected] "use"
     [email protected]
       [email protected] "/"
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
index b3bcf472a..9a0f4665e 100644
--- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
+++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 9588cf3b3..0415085b0 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..13
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -14,10 +14,10 @@ [email protected]
             [email protected] "bar"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@14..17
+  [email protected]
     [email protected] "use"
   [email protected] "\n"
-  USE_ITEM@18..33
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -31,7 +31,7 @@ [email protected]
             [email protected] "baz"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@34..37
+  [email protected]
     [email protected] "use"
   [email protected] "\n"
   [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
index f926b67d2..ef6172f8a 100644
--- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
+++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..36
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
index d2a549273..284c8715b 100644
--- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
           [email protected] "crate"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@13..54
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -52,7 +52,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@55..72
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -66,7 +66,7 @@ [email protected]
           [email protected] "crate"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@73..97
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
index d0360c467..2049a9d72 100644
--- a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
           [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@13..26
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -23,7 +23,7 @@ [email protected]
           [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@27..47
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -41,7 +41,7 @@ [email protected]
           [email protected] "super"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@48..66
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
index 4f382b06c..deadf56b4 100644
--- a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..11
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
           [email protected] "self"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@12..24
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
index da8505607..2f59d0606 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index cf3a90400..1e80dd7e2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..58
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -51,7 +51,7 @@ [email protected]
   [email protected] " "
   [email protected] "// Rust 2018 (with a  ..."
   [email protected] "\n"
-  USE_ITEM@98..121
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -77,7 +77,7 @@ [email protected]
   [email protected] " "
   [email protected] "// Rust 2015"
   [email protected] "\n"
-  USE_ITEM@135..166
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -104,7 +104,7 @@ [email protected]
   [email protected] " "
   [email protected] "// Rust 2015"
   [email protected] "\n"
-  USE_ITEM@180..205
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
index 9e898b7b9..b3623c445 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
@@ -1,12 +1,12 @@
 [email protected]
-  USE_ITEM@0..6
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
       [email protected] "*"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@7..15
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -14,7 +14,7 @@ [email protected]
       [email protected] "*"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@16..36
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -35,7 +35,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@37..59
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
index 8e9061e1d..60b517230 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..28
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -20,7 +20,7 @@ [email protected]
           [email protected] "some_name"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@29..181
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -121,7 +121,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@182..197
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
index caa76fe8a..702f2e0b0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..15
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
index 18cd5271f..c4c5bc51e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..18
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -17,7 +17,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@19..36
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
index 015a7a7d2..82028096f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..17
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
   [email protected] " "
   [email protected] "// Rust 2018 - All fl ..."
   [email protected] "\n"
-  USE_ITEM@46..61
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -24,7 +24,7 @@ [email protected]
   [email protected] " "
   [email protected] "// Rust 2018 - Anchor ..."
   [email protected] "\n"
-  USE_ITEM@92..124
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
index 96b8a94fc..6be1cf9fc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..8
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
             [email protected] "foo"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@9..19
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
index 07272dc3c..4d49e7933 100644
--- a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..20
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -20,7 +20,7 @@ [email protected]
             [email protected] "baz"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@21..39
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
index 05d9c05ad..66ab13660 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..14
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -13,7 +13,7 @@ [email protected]
             [email protected] "foo"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@15..37
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
index 3642c107b..4389d2d4b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
@@ -1,12 +1,12 @@
 [email protected]
-  USE_ITEM@0..6
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
       [email protected] "*"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@7..15
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -14,7 +14,7 @@ [email protected]
       [email protected] "*"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@16..25
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -24,7 +24,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@26..33
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -33,7 +33,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@34..45
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -45,7 +45,7 @@ [email protected]
       [email protected] "*"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@46..58
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -59,7 +59,7 @@ [email protected]
         [email protected] "}"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@59..80
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
index cdddb4214..d7e93f7eb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..15
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -15,7 +15,7 @@ [email protected]
           [email protected] "bar"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@16..54
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index eb59d6e17..bbdf896d1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -78,7 +78,7 @@ [email protected]
       [email protected] "\"128\""
     [email protected] "]"
   [email protected] "\n\n"
-  USE_ITEM@407..427
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]
@@ -98,7 +98,7 @@ [email protected]
             [email protected] "Cell"
     [email protected] ";"
   [email protected] "\n"
-  USE_ITEM@428..447
+  [email protected]
     [email protected] "use"
     [email protected] " "
     [email protected]