Introduce ModuleId

Previously, module was synonym with a file, and so a module could have
had several parents. This commit introduces a separate module concept,
such that each module has only one parent, but a single file can
correspond to different modules.

1 files changed, 2 insertions, 2 deletions

diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs
index 956cbe162..b527cde61 100644
--- a/crates/ra_analysis/src/db.rs
+++ b/crates/ra_analysis/src/db.rs
@@ -12,7 +12,7 @@ use salsa;
 use crate::{
     db,
     Cancelable, Canceled,
-    module_map::{ModuleDescriptorQuery, ModuleTreeQuery, ModulesDatabase},
+    descriptors::module::{SubmodulesQuery, ModuleTreeQuery, ModulesDatabase},
     symbol_index::SymbolIndex,
     FileId, FileResolverImp,
 };
@@ -69,7 +69,7 @@ salsa::database_storage! {
         }
         impl ModulesDatabase {
             fn module_tree() for ModuleTreeQuery;
-            fn module_descriptor() for ModuleDescriptorQuery;
+            fn module_descriptor() for SubmodulesQuery;
         }
     }
 }