aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/impl_block.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-01-08 08:28:42 +0000
committerAleksey Kladov <[email protected]>2019-01-08 08:28:42 +0000
commitda0b348ae9f629c5cbe4a836a90ed85e36ca18e5 (patch)
tree614fd83f614632e3c87130117421708a7a028c13 /crates/ra_hir/src/impl_block.rs
parentd6020f516f2826dac7188171241e9a72d6248cf8 (diff)
migrate ra_hir to rowan 2.0
Diffstat (limited to 'crates/ra_hir/src/impl_block.rs')
-rw-r--r--crates/ra_hir/src/impl_block.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 7ce8d17e6..bb0ad84e4 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -62,7 +62,7 @@ impl ImplData {
62 db: &impl AsRef<LocationIntener<DefLoc, DefId>>, 62 db: &impl AsRef<LocationIntener<DefLoc, DefId>>,
63 file_items: &SourceFileItems, 63 file_items: &SourceFileItems,
64 module: &Module, 64 module: &Module,
65 node: ast::ImplBlock, 65 node: &ast::ImplBlock,
66 ) -> Self { 66 ) -> Self {
67 let target_trait = node.target_type().map(TypeRef::from_ast); 67 let target_trait = node.target_type().map(TypeRef::from_ast);
68 let target_type = TypeRef::from_ast_opt(node.target_type()); 68 let target_type = TypeRef::from_ast_opt(node.target_type());
@@ -71,10 +71,10 @@ impl ImplData {
71 item_list 71 item_list
72 .impl_items() 72 .impl_items()
73 .map(|item_node| { 73 .map(|item_node| {
74 let kind = match item_node { 74 let kind = match item_node.kind() {
75 ast::ImplItem::FnDef(..) => DefKind::Function, 75 ast::ImplItemKind::FnDef(..) => DefKind::Function,
76 ast::ImplItem::ConstDef(..) => DefKind::Item, 76 ast::ImplItemKind::ConstDef(..) => DefKind::Item,
77 ast::ImplItem::TypeDef(..) => DefKind::Item, 77 ast::ImplItemKind::TypeDef(..) => DefKind::Item,
78 }; 78 };
79 let item_id = file_items.id_of_unchecked(item_node.syntax()); 79 let item_id = file_items.id_of_unchecked(item_node.syntax());
80 let source_item_id = SourceItemId { 80 let source_item_id = SourceItemId {
@@ -87,10 +87,10 @@ impl ImplData {
87 ..module_loc 87 ..module_loc
88 }; 88 };
89 let def_id = def_loc.id(db); 89 let def_id = def_loc.id(db);
90 match item_node { 90 match item_node.kind() {
91 ast::ImplItem::FnDef(..) => ImplItem::Method(Function::new(def_id)), 91 ast::ImplItemKind::FnDef(..) => ImplItem::Method(Function::new(def_id)),
92 ast::ImplItem::ConstDef(..) => ImplItem::Const(def_id), 92 ast::ImplItemKind::ConstDef(..) => ImplItem::Const(def_id),
93 ast::ImplItem::TypeDef(..) => ImplItem::Type(def_id), 93 ast::ImplItemKind::TypeDef(..) => ImplItem::Type(def_id),
94 } 94 }
95 }) 95 })
96 .collect() 96 .collect()
@@ -152,8 +152,8 @@ impl ModuleImplBlocks {
152 fn collect(&mut self, db: &impl HirDatabase, module: Module) -> Cancelable<()> { 152 fn collect(&mut self, db: &impl HirDatabase, module: Module) -> Cancelable<()> {
153 let (file_id, module_source) = module.defenition_source(db)?; 153 let (file_id, module_source) = module.defenition_source(db)?;
154 let node = match &module_source { 154 let node = match &module_source {
155 ModuleSource::SourceFile(node) => node.borrowed().syntax(), 155 ModuleSource::SourceFile(node) => node.syntax(),
156 ModuleSource::Module(node) => node.borrowed().syntax(), 156 ModuleSource::Module(node) => node.syntax(),
157 }; 157 };
158 158
159 let source_file_items = db.file_items(file_id.into()); 159 let source_file_items = db.file_items(file_id.into());