Merge item tree traits

The Source trait isn't needed anymore since we no longer merge
extern crate items with use items.

1 files changed, 11 insertions, 16 deletions

diff --git a/crates/ra_hir_def/src/item_tree.rs b/crates/ra_hir_def/src/item_tree.rs
index 5beb11df7..a75271703 100644
--- a/crates/ra_hir_def/src/item_tree.rs
+++ b/crates/ra_hir_def/src/item_tree.rs
@@ -153,7 +153,7 @@ impl ItemTree {
         self.inner_items.values().flatten().copied()
     }
 
-    pub fn source<S: ItemTreeSource>(
+    pub fn source<S: ItemTreeNode>(
         &self,
         db: &dyn DefDatabase,
         of: FileItemTreeId<S>,
@@ -173,6 +173,10 @@ impl ItemTree {
 
 /// Trait implemented by all nodes in the item tree.
 pub trait ItemTreeNode: Clone {
+    type Source: AstNode + Into<ast::ModuleItem>;
+
+    fn ast_id(&self) -> FileAstId<Self::Source>;
+
     /// Looks up an instance of `Self` in an item tree.
     fn lookup(tree: &ItemTree, index: Idx<Self>) -> &Self;
 
@@ -183,13 +187,6 @@ pub trait ItemTreeNode: Clone {
     fn id_to_mod_item(id: FileItemTreeId<Self>) -> ModItem;
 }
 
-/// Trait for item tree nodes that allow accessing the original AST node.
-pub trait ItemTreeSource: ItemTreeNode {
-    type Source: AstNode + Into<ast::ModuleItem>;
-
-    fn ast_id(&self) -> FileAstId<Self::Source>;
-}
-
 pub struct FileItemTreeId<N: ItemTreeNode> {
     index: Idx<N>,
     _p: PhantomData<N>,
@@ -242,6 +239,12 @@ macro_rules! mod_items {
 
         $(
             impl ItemTreeNode for $typ {
+                type Source = $ast;
+
+                fn ast_id(&self) -> FileAstId<Self::Source> {
+                    self.ast_id
+                }
+
                 fn lookup(tree: &ItemTree, index: Idx<Self>) -> &Self {
                     &tree.$fld[index]
                 }
@@ -259,14 +262,6 @@ macro_rules! mod_items {
                 }
             }
 
-            impl ItemTreeSource for $typ {
-                type Source = $ast;
-
-                fn ast_id(&self) -> FileAstId<Self::Source> {
-                    self.ast_id
-                }
-            }
-
             impl Index<Idx<$typ>> for ItemTree {
                 type Output = $typ;