aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/code_model_impl
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/code_model_impl')
-rw-r--r--crates/ra_hir/src/code_model_impl/function.rs4
-rw-r--r--crates/ra_hir/src/code_model_impl/module.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs
index 009175bab..daf49e791 100644
--- a/crates/ra_hir/src/code_model_impl/function.rs
+++ b/crates/ra_hir/src/code_model_impl/function.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
4 4
5use ra_db::Cancelable; 5use ra_db::Cancelable;
6use ra_syntax::{ 6use ra_syntax::{
7 TreePtr, 7 TreeArc,
8 ast::{self, AstNode, NameOwner}, 8 ast::{self, AstNode, NameOwner},
9}; 9};
10 10
@@ -22,7 +22,7 @@ impl Function {
22 Function { def_id } 22 Function { def_id }
23 } 23 }
24 24
25 pub(crate) fn source_impl(&self, db: &impl HirDatabase) -> (HirFileId, TreePtr<ast::FnDef>) { 25 pub(crate) fn source_impl(&self, db: &impl HirDatabase) -> (HirFileId, TreeArc<ast::FnDef>) {
26 let def_loc = self.def_id.loc(db); 26 let def_loc = self.def_id.loc(db);
27 assert!(def_loc.kind == DefKind::Function); 27 assert!(def_loc.kind == DefKind::Function);
28 let syntax = db.file_item(def_loc.source_item_id); 28 let syntax = db.file_item(def_loc.source_item_id);
diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs
index 878dc37c8..e9ff06dc8 100644
--- a/crates/ra_hir/src/code_model_impl/module.rs
+++ b/crates/ra_hir/src/code_model_impl/module.rs
@@ -1,5 +1,5 @@
1use ra_db::{Cancelable, SourceRootId, FileId}; 1use ra_db::{Cancelable, SourceRootId, FileId};
2use ra_syntax::{ast, SyntaxNode, AstNode, TreePtr}; 2use ra_syntax::{ast, SyntaxNode, AstNode, TreeArc};
3 3
4use crate::{ 4use crate::{
5 Module, ModuleSource, Problem, 5 Module, ModuleSource, Problem,
@@ -57,7 +57,7 @@ impl Module {
57 pub fn declaration_source_impl( 57 pub fn declaration_source_impl(
58 &self, 58 &self,
59 db: &impl HirDatabase, 59 db: &impl HirDatabase,
60 ) -> Cancelable<Option<(FileId, TreePtr<ast::Module>)>> { 60 ) -> Cancelable<Option<(FileId, TreeArc<ast::Module>)>> {
61 let loc = self.def_id.loc(db); 61 let loc = self.def_id.loc(db);
62 let module_tree = db.module_tree(loc.source_root_id)?; 62 let module_tree = db.module_tree(loc.source_root_id)?;
63 let link = ctry!(loc.module_id.parent_link(&module_tree)); 63 let link = ctry!(loc.module_id.parent_link(&module_tree));
@@ -173,7 +173,7 @@ impl Module {
173 pub fn problems_impl( 173 pub fn problems_impl(
174 &self, 174 &self,
175 db: &impl HirDatabase, 175 db: &impl HirDatabase,
176 ) -> Cancelable<Vec<(TreePtr<SyntaxNode>, Problem)>> { 176 ) -> Cancelable<Vec<(TreeArc<SyntaxNode>, Problem)>> {
177 let loc = self.def_id.loc(db); 177 let loc = self.def_id.loc(db);
178 let module_tree = db.module_tree(loc.source_root_id)?; 178 let module_tree = db.module_tree(loc.source_root_id)?;
179 Ok(loc.module_id.problems(&module_tree, db)) 179 Ok(loc.module_id.problems(&module_tree, db))