From 6be50f7d5de3737464853a589673375fc0cafa97 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 31 Oct 2018 23:41:43 +0300 Subject: Reformat all --- crates/ra_analysis/src/descriptors/module/imp.rs | 33 ++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'crates/ra_analysis/src/descriptors/module/imp.rs') diff --git a/crates/ra_analysis/src/descriptors/module/imp.rs b/crates/ra_analysis/src/descriptors/module/imp.rs index dae3a356d..1c102f4e5 100644 --- a/crates/ra_analysis/src/descriptors/module/imp.rs +++ b/crates/ra_analysis/src/descriptors/module/imp.rs @@ -1,24 +1,25 @@ use std::sync::Arc; -use relative_path::RelativePathBuf; -use rustc_hash::{FxHashMap, FxHashSet}; use ra_syntax::{ - SmolStr, ast::{self, NameOwner}, + SmolStr, }; +use relative_path::RelativePathBuf; +use rustc_hash::{FxHashMap, FxHashSet}; use crate::{ - FileId, Cancelable, FileResolverImp, db, - input::{SourceRoot, SourceRootId}, + db, descriptors::DescriptorDatabase, + input::{SourceRoot, SourceRootId}, + Cancelable, FileId, FileResolverImp, }; -use super::{ - ModuleData, ModuleTree, ModuleId, LinkId, LinkData, Problem, ModuleScope -}; - +use super::{LinkData, LinkId, ModuleData, ModuleId, ModuleScope, ModuleTree, Problem}; -pub(crate) fn submodules(db: &impl DescriptorDatabase, file_id: FileId) -> Cancelable>> { +pub(crate) fn submodules( + db: &impl DescriptorDatabase, + file_id: FileId, +) -> Cancelable>> { db::check_canceled(db)?; let file = db.file_syntax(file_id); let root = file.ast(); @@ -57,13 +58,11 @@ pub(crate) fn module_tree( Ok(Arc::new(res)) } - #[derive(Clone, Hash, PartialEq, Eq, Debug)] pub struct Submodule { pub name: SmolStr, } - fn create_module_tree<'a>( db: &impl DescriptorDatabase, source_root: SourceRootId, @@ -82,7 +81,15 @@ fn create_module_tree<'a>( continue; // TODO: use explicit crate_roots here } assert!(!roots.contains_key(&file_id)); - let module_id = build_subtree(db, &source_root, &mut tree, &mut visited, &mut roots, None, file_id)?; + let module_id = build_subtree( + db, + &source_root, + &mut tree, + &mut visited, + &mut roots, + None, + file_id, + )?; roots.insert(file_id, module_id); } Ok(tree) -- cgit v1.2.3