2 files changed, 17 insertions, 48 deletions

diff --git a/crates/ra_hir/src/nameres/lower.rs b/crates/ra_hir/src/nameres/lower.rs
index 7e6e48ae0..7e9a3de2b 100644
--- a/crates/ra_hir/src/nameres/lower.rs
+++ b/crates/ra_hir/src/nameres/lower.rs
@@ -82,13 +82,9 @@ impl LoweredModule {
         let mut source_map = ImportSourceMap::default();
         let mut res = LoweredModule::default();
         match source {
-            ModuleSource::SourceFile(it) => res.fill(
-                &mut source_map,
-                db,
-                module,
-                file_id,
-                &mut it.items_with_macros(),
-            ),
+            ModuleSource::SourceFile(it) => {
+                res.fill(&mut source_map, db, module, file_id, &mut it.items_with_macros())
+            }
             ModuleSource::Module(it) => {
                 if let Some(item_list) = it.item_list() {
                     res.fill(
@@ -121,10 +117,8 @@ impl LoweredModule {
                 }
                 ast::ItemOrMacro::Macro(macro_call) => {
                     let item_id = file_items.id_of_unchecked(macro_call.syntax());
-                    let loc = MacroCallLoc {
-                        module,
-                        source_item_id: SourceItemId { file_id, item_id },
-                    };
+                    let loc =
+                        MacroCallLoc { module, source_item_id: SourceItemId { file_id, item_id } };
                     let id = loc.id(db);
                     let file_id = HirFileId::from(id);
                     //FIXME: expand recursively
@@ -163,22 +157,19 @@ impl LoweredModule {
             ast::ModuleItemKind::FnDef(it) => {
                 if let Some(name) = it.name() {
                     let func = Function { id: ctx.to_def(it) };
-                    self.declarations
-                        .insert(name.as_name(), PerNs::values(func.into()));
+                    self.declarations.insert(name.as_name(), PerNs::values(func.into()));
                 }
             }
             ast::ModuleItemKind::TraitDef(it) => {
                 if let Some(name) = it.name() {
                     let t = Trait { id: ctx.to_def(it) };
-                    self.declarations
-                        .insert(name.as_name(), PerNs::types(t.into()));
+                    self.declarations.insert(name.as_name(), PerNs::types(t.into()));
                 }
             }
             ast::ModuleItemKind::TypeDef(it) => {
                 if let Some(name) = it.name() {
                     let t = Type { id: ctx.to_def(it) };
-                    self.declarations
-                        .insert(name.as_name(), PerNs::types(t.into()));
+                    self.declarations.insert(name.as_name(), PerNs::types(t.into()));
                 }
             }
             ast::ModuleItemKind::ImplBlock(_) => {
@@ -207,15 +198,13 @@ impl LoweredModule {
             ast::ModuleItemKind::ConstDef(it) => {
                 if let Some(name) = it.name() {
                     let c = Const { id: ctx.to_def(it) };
-                    self.declarations
-                        .insert(name.as_name(), PerNs::values(c.into()));
+                    self.declarations.insert(name.as_name(), PerNs::values(c.into()));
                 }
             }
             ast::ModuleItemKind::StaticDef(it) => {
                 if let Some(name) = it.name() {
                     let s = Static { id: ctx.to_def(it) };
-                    self.declarations
-                        .insert(name.as_name(), PerNs::values(s.into()));
+                    self.declarations.insert(name.as_name(), PerNs::values(s.into()));
                 }
             }
             ast::ModuleItemKind::Module(_) => {
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 0654dbaa1..3dfad6bf2 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -42,19 +42,11 @@ fn check_module_item_map(map: &ItemMap, module_id: ModuleId, expected: &str) {
         .collect::<Vec<_>>();
     lines.sort();
     let actual = lines.join("\n");
-    let expected = expected
-        .trim()
-        .lines()
-        .map(|it| it.trim())
-        .collect::<Vec<_>>()
-        .join("\n");
+    let expected = expected.trim().lines().map(|it| it.trim()).collect::<Vec<_>>().join("\n");
     assert_eq_text!(&expected, &actual);
 
     fn dump_resolution(resolution: &Resolution) -> &'static str {
-        match (
-            resolution.def.types.is_some(),
-            resolution.def.values.is_some(),
-        ) {
+        match (resolution.def.types.is_some(), resolution.def.values.is_some()) {
             (true, true) => "t v",
             (true, false) => "t",
             (false, true) => "v",
@@ -314,9 +306,7 @@ fn item_map_across_crates() {
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
     let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
-        .add_dep(main_crate, "test_crate".into(), lib_crate)
-        .unwrap();
+    crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap();
 
     db.set_crate_graph(Arc::new(crate_graph));
 
@@ -357,9 +347,7 @@ fn extern_crate_rename() {
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
     let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
-        .add_dep(main_crate, "alloc".into(), lib_crate)
-        .unwrap();
+    crate_graph.add_dep(main_crate, "alloc".into(), lib_crate).unwrap();
 
     db.set_crate_graph(Arc::new(crate_graph));
 
@@ -406,9 +394,7 @@ fn import_across_source_roots() {
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
     let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
-        .add_dep(main_crate, "test_crate".into(), lib_crate)
-        .unwrap();
+    crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap();
 
     db.set_crate_graph(Arc::new(crate_graph));
 
@@ -447,9 +433,7 @@ fn reexport_across_crates() {
     let mut crate_graph = CrateGraph::default();
     let main_crate = crate_graph.add_crate_root(main_id);
     let lib_crate = crate_graph.add_crate_root(lib_id);
-    crate_graph
-        .add_dep(main_crate, "test_crate".into(), lib_crate)
-        .unwrap();
+    crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap();
 
     db.set_crate_graph(Arc::new(crate_graph));
 
@@ -482,11 +466,7 @@ fn check_item_map_is_not_recomputed(initial: &str, file_change: &str) {
         let events = db.log_executed(|| {
             db.item_map(krate);
         });
-        assert!(
-            !format!("{:?}", events).contains("item_map"),
-            "{:#?}",
-            events
-        )
+        assert!(!format!("{:?}", events).contains("item_map"), "{:#?}", events)
     }
 }