diff options
Diffstat (limited to 'crates/ra_hir/src/code_model_impl')
-rw-r--r-- | crates/ra_hir/src/code_model_impl/function.rs | 12 | ||||
-rw-r--r-- | crates/ra_hir/src/code_model_impl/krate.rs | 9 | ||||
-rw-r--r-- | crates/ra_hir/src/code_model_impl/module.rs | 10 |
3 files changed, 6 insertions, 25 deletions
diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs index 8326c02c7..b9438fdb7 100644 --- a/crates/ra_hir/src/code_model_impl/function.rs +++ b/crates/ra_hir/src/code_model_impl/function.rs | |||
@@ -25,10 +25,7 @@ impl FnSignature { | |||
25 | func: Function, | 25 | func: Function, |
26 | ) -> Arc<FnSignature> { | 26 | ) -> Arc<FnSignature> { |
27 | let (_, node) = func.source(db); | 27 | let (_, node) = func.source(db); |
28 | let name = node | 28 | let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing); |
29 | .name() | ||
30 | .map(|n| n.as_name()) | ||
31 | .unwrap_or_else(Name::missing); | ||
32 | let mut params = Vec::new(); | 29 | let mut params = Vec::new(); |
33 | let mut has_self_param = false; | 30 | let mut has_self_param = false; |
34 | if let Some(param_list) = node.param_list() { | 31 | if let Some(param_list) = node.param_list() { |
@@ -61,12 +58,7 @@ impl FnSignature { | |||
61 | TypeRef::unit() | 58 | TypeRef::unit() |
62 | }; | 59 | }; |
63 | 60 | ||
64 | let sig = FnSignature { | 61 | let sig = FnSignature { name, params, ret_type, has_self_param }; |
65 | name, | ||
66 | params, | ||
67 | ret_type, | ||
68 | has_self_param, | ||
69 | }; | ||
70 | Arc::new(sig) | 62 | Arc::new(sig) |
71 | } | 63 | } |
72 | } | 64 | } |
diff --git a/crates/ra_hir/src/code_model_impl/krate.rs b/crates/ra_hir/src/code_model_impl/krate.rs index 1517434b8..161ae6e18 100644 --- a/crates/ra_hir/src/code_model_impl/krate.rs +++ b/crates/ra_hir/src/code_model_impl/krate.rs | |||
@@ -11,9 +11,7 @@ impl Crate { | |||
11 | crate_graph | 11 | crate_graph |
12 | .dependencies(self.crate_id) | 12 | .dependencies(self.crate_id) |
13 | .map(|dep| { | 13 | .map(|dep| { |
14 | let krate = Crate { | 14 | let krate = Crate { crate_id: dep.crate_id() }; |
15 | crate_id: dep.crate_id(), | ||
16 | }; | ||
17 | let name = dep.as_name(); | 15 | let name = dep.as_name(); |
18 | CrateDependency { krate, name } | 16 | CrateDependency { krate, name } |
19 | }) | 17 | }) |
@@ -23,10 +21,7 @@ impl Crate { | |||
23 | let module_tree = db.module_tree(*self); | 21 | let module_tree = db.module_tree(*self); |
24 | let module_id = module_tree.modules().next()?; | 22 | let module_id = module_tree.modules().next()?; |
25 | 23 | ||
26 | let module = Module { | 24 | let module = Module { krate: *self, module_id }; |
27 | krate: *self, | ||
28 | module_id, | ||
29 | }; | ||
30 | Some(module) | 25 | Some(module) |
31 | } | 26 | } |
32 | } | 27 | } |
diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs index f487b8532..1425fa693 100644 --- a/crates/ra_hir/src/code_model_impl/module.rs +++ b/crates/ra_hir/src/code_model_impl/module.rs | |||
@@ -12,10 +12,7 @@ use crate::{ | |||
12 | 12 | ||
13 | impl Module { | 13 | impl Module { |
14 | fn with_module_id(&self, module_id: ModuleId) -> Module { | 14 | fn with_module_id(&self, module_id: ModuleId) -> Module { |
15 | Module { | 15 | Module { module_id, krate: self.krate } |
16 | module_id, | ||
17 | krate: self.krate, | ||
18 | } | ||
19 | } | 16 | } |
20 | 17 | ||
21 | pub(crate) fn name_impl(&self, db: &impl HirDatabase) -> Option<Name> { | 18 | pub(crate) fn name_impl(&self, db: &impl HirDatabase) -> Option<Name> { |
@@ -42,10 +39,7 @@ impl Module { | |||
42 | ) -> Option<(FileId, TreeArc<ast::Module>)> { | 39 | ) -> Option<(FileId, TreeArc<ast::Module>)> { |
43 | let module_tree = db.module_tree(self.krate); | 40 | let module_tree = db.module_tree(self.krate); |
44 | let link = self.module_id.parent_link(&module_tree)?; | 41 | let link = self.module_id.parent_link(&module_tree)?; |
45 | let file_id = link | 42 | let file_id = link.owner(&module_tree).file_id(&module_tree).as_original_file(); |
46 | .owner(&module_tree) | ||
47 | .file_id(&module_tree) | ||
48 | .as_original_file(); | ||
49 | let src = link.source(&module_tree, db); | 43 | let src = link.source(&module_tree, db); |
50 | Some((file_id, src)) | 44 | Some((file_id, src)) |
51 | } | 45 | } |