3 files changed, 11 insertions, 35 deletions
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 275894252..614325a0f 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -64,10 +64,7 @@ struct CrateData {
 impl CrateData {
    fn new(file_id: FileId) -> CrateData {
-        CrateData {
+        CrateData { file_id, dependencies: Vec::new() }
-            file_id,
-            dependencies: Vec::new(),
-        }
    }
    fn add_dep(&mut self, name: SmolStr, crate_id: CrateId) {
@@ -112,10 +109,7 @@ impl CrateGraph {
        self.arena[&crate_id].file_id
    }
    pub fn crate_id_for_crate_root(&self, file_id: FileId) -> Option<CrateId> {
-        let (&crate_id, _) = self
+        let (&crate_id, _) = self.arena.iter().find(|(_crate_id, data)| data.file_id == file_id)?;
-            .arena
-            .iter()
-            .find(|(_crate_id, data)| data.file_id == file_id)?;
        Some(crate_id)
    }
    pub fn dependencies<'a>(
@@ -153,15 +147,9 @@ mod tests {
        let crate1 = graph.add_crate_root(FileId(1u32));
        let crate2 = graph.add_crate_root(FileId(2u32));
        let crate3 = graph.add_crate_root(FileId(3u32));
-        assert!(graph
+        assert!(graph.add_dep(crate1, SmolStr::new("crate2"), crate2).is_ok());
-            .add_dep(crate1, SmolStr::new("crate2"), crate2)
+        assert!(graph.add_dep(crate2, SmolStr::new("crate3"), crate3).is_ok());
-            .is_ok());
+        assert!(graph.add_dep(crate3, SmolStr::new("crate1"), crate1).is_err());
-        assert!(graph
-            .add_dep(crate2, SmolStr::new("crate3"), crate3)
-            .is_ok());
-        assert!(graph
-            .add_dep(crate3, SmolStr::new("crate1"), crate1)
-            .is_err());
    }
    #[test]
@@ -170,11 +158,7 @@ mod tests {
        let crate1 = graph.add_crate_root(FileId(1u32));
        let crate2 = graph.add_crate_root(FileId(2u32));
        let crate3 = graph.add_crate_root(FileId(3u32));
-        assert!(graph
+        assert!(graph.add_dep(crate1, SmolStr::new("crate2"), crate2).is_ok());
-            .add_dep(crate1, SmolStr::new("crate2"), crate2)
+        assert!(graph.add_dep(crate2, SmolStr::new("crate3"), crate3).is_ok());
-            .is_ok());
-        assert!(graph
-            .add_dep(crate2, SmolStr::new("crate3"), crate3)
-            .is_ok());
    }
 }
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 66634e05b..31442713d 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -94,11 +94,8 @@ pub trait SourceDatabase: CheckCanceled + std::fmt::Debug {
 fn source_root_crates(db: &impl SourceDatabase, id: SourceRootId) -> Arc<Vec<CrateId>> {
    let root = db.source_root(id);
    let graph = db.crate_graph();
-    let res = root
+    let res =
-        .files
+        root.files.values().filter_map(|&it| graph.crate_id_for_crate_root(it)).collect::<Vec<_>>();
-        .values()
-        .filter_map(|&it| graph.crate_id_for_crate_root(it))
-        .collect::<Vec<_>>();
    Arc::new(res)
 }
diff --git a/crates/ra_db/src/loc2id.rs b/crates/ra_db/src/loc2id.rs
index 359cd893d..d27fa7682 100644
--- a/crates/ra_db/src/loc2id.rs
+++ b/crates/ra_db/src/loc2id.rs
@@ -30,10 +30,7 @@ where
    LOC: Clone + Eq + Hash,
 {
    fn default() -> Self {
-        Loc2IdMap {
+        Loc2IdMap { id2loc: Arena::default(), loc2id: FxHashMap::default() }
-            id2loc: Arena::default(),
-            loc2id: FxHashMap::default(),
-        }
    }
 }
@@ -85,9 +82,7 @@ where
    LOC: Clone + Eq + Hash,
 {
    fn default() -> Self {
-        LocationIntener {
+        LocationIntener { map: Default::default() }
-            map: Default::default(),
-        }
    }
 }