aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src/body
diff options
context:
space:
mode:
authorJonas Schievink <[email protected]>2020-06-23 17:46:08 +0100
committerJonas Schievink <[email protected]>2020-06-24 15:53:56 +0100
commitf9a1a9cd3c7757ca3f8ba59287b5d36645008b9b (patch)
treeaf7502e953fd01422db014cbc5b30685f9369480 /crates/ra_hir_def/src/body
parentb5fd02d93cdfafeba23f50ca9c414053aaa548ae (diff)
Merge item tree traits
The Source trait isn't needed anymore since we no longer merge extern crate items with use items.
Diffstat (limited to 'crates/ra_hir_def/src/body')
-rw-r--r--crates/ra_hir_def/src/body/lower.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index bbde0b802..a74136b8e 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -27,7 +27,7 @@ use crate::{
27 LogicOp, MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement, 27 LogicOp, MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement,
28 }, 28 },
29 item_scope::BuiltinShadowMode, 29 item_scope::BuiltinShadowMode,
30 item_tree::{FileItemTreeId, ItemTree, ItemTreeSource}, 30 item_tree::{FileItemTreeId, ItemTree, ItemTreeNode},
31 path::{GenericArgs, Path}, 31 path::{GenericArgs, Path},
32 type_ref::{Mutability, Rawness, TypeRef}, 32 type_ref::{Mutability, Rawness, TypeRef},
33 AdtId, ConstLoc, ContainerId, DefWithBodyId, EnumLoc, FunctionLoc, Intern, ModuleDefId, 33 AdtId, ConstLoc, ContainerId, DefWithBodyId, EnumLoc, FunctionLoc, Intern, ModuleDefId,
@@ -557,7 +557,7 @@ impl ExprCollector<'_> {
557 } 557 }
558 } 558 }
559 559
560 fn find_inner_item<S: ItemTreeSource>(&self, id: AstId<ast::ModuleItem>) -> FileItemTreeId<S> { 560 fn find_inner_item<S: ItemTreeNode>(&self, id: AstId<ast::ModuleItem>) -> FileItemTreeId<S> {
561 let index = 561 let index =
562 self.item_trees.iter().position(|(file, _)| *file == id.file_id).unwrap_or_else(|| { 562 self.item_trees.iter().position(|(file, _)| *file == id.file_id).unwrap_or_else(|| {
563 panic!("couldn't find item tree for file {:?}", id.file_id); 563 panic!("couldn't find item tree for file {:?}", id.file_id);