reformat the world

This commit is contained in:
Aleksey Kladov
2019-02-08 14:49:43 +03:00
parent 5cb1d41a30
commit 12e3b4c70b
129 changed files with 727 additions and 2509 deletions

View File

@@ -25,10 +25,7 @@ impl FnSignature {
func: Function,
) -> Arc<FnSignature> {
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)
}
}

View File

@@ -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)
}
}

View File

@@ -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<Name> {
@@ -42,10 +39,7 @@ impl Module {
) -> Option<(FileId, TreeArc<ast::Module>)> {
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))
}