move ids to HIR

crates/ra_analysis/src/db.rs

@@ -5,9 +5,8 @@ use salsa::{self, Database};
 use ra_db::{LocationIntener, BaseDatabase};
 
 use crate::{
-    hir,
+    hir::{self, DefId, DefLoc, FnId, SourceItemId},
     symbol_index,
-    loc2id::{IdMaps, DefId, DefLoc, FnId},
 };
 
 #[derive(Debug)]
@@ -21,6 +20,12 @@ pub(crate) struct RootDatabase {
     id_maps: Arc<IdMaps>,
 }
 
+#[derive(Debug, Default)]
+struct IdMaps {
+    fns: LocationIntener<SourceItemId, FnId>,
+    defs: LocationIntener<DefLoc, DefId>,
+}
+
 impl salsa::Database for RootDatabase {
     fn salsa_runtime(&self) -> &salsa::Runtime<RootDatabase> {
         &self.runtime