From 12e3b4c70b5ef23b2fdfc197296d483680e125f9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 8 Feb 2019 14:49:43 +0300 Subject: reformat the world --- crates/ra_hir/src/code_model_impl/function.rs | 12 ++---------- crates/ra_hir/src/code_model_impl/krate.rs | 9 ++------- crates/ra_hir/src/code_model_impl/module.rs | 10 ++-------- 3 files changed, 6 insertions(+), 25 deletions(-) (limited to 'crates/ra_hir/src/code_model_impl') 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 { func: Function, ) -> Arc { let (_, node) = func.source(db); - let name = node - .name() - .map(|n| n.as_name()) - .unwrap_or_else(Name::missing); + let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing); let mut params = Vec::new(); let mut has_self_param = false; if let Some(param_list) = node.param_list() { @@ -61,12 +58,7 @@ impl FnSignature { TypeRef::unit() }; - let sig = FnSignature { - name, - params, - ret_type, - has_self_param, - }; + let sig = FnSignature { name, params, ret_type, has_self_param }; Arc::new(sig) } } 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 { crate_graph .dependencies(self.crate_id) .map(|dep| { - let krate = Crate { - crate_id: dep.crate_id(), - }; + let krate = Crate { crate_id: dep.crate_id() }; let name = dep.as_name(); CrateDependency { krate, name } }) @@ -23,10 +21,7 @@ impl Crate { let module_tree = db.module_tree(*self); let module_id = module_tree.modules().next()?; - let module = Module { - krate: *self, - module_id, - }; + let module = Module { krate: *self, module_id }; Some(module) } } 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::{ impl Module { fn with_module_id(&self, module_id: ModuleId) -> Module { - Module { - module_id, - krate: self.krate, - } + Module { module_id, krate: self.krate } } pub(crate) fn name_impl(&self, db: &impl HirDatabase) -> Option { @@ -42,10 +39,7 @@ impl Module { ) -> Option<(FileId, TreeArc)> { let module_tree = db.module_tree(self.krate); let link = self.module_id.parent_link(&module_tree)?; - let file_id = link - .owner(&module_tree) - .file_id(&module_tree) - .as_original_file(); + let file_id = link.owner(&module_tree).file_id(&module_tree).as_original_file(); let src = link.source(&module_tree, db); Some((file_id, src)) } -- cgit v1.2.3