5 files changed, 8 insertions, 9 deletions

diff --git a/crates/ra_analysis/src/completion/mod.rs b/crates/ra_analysis/src/completion/mod.rs
index 1eb804c85..08fb149af 100644
--- a/crates/ra_analysis/src/completion/mod.rs
+++ b/crates/ra_analysis/src/completion/mod.rs
@@ -11,9 +11,9 @@ use rustc_hash::{FxHashMap};
 
 use crate::{
     db::{self, SyntaxDatabase},
-    hir::{
-        module::{ModuleDescriptor}
-    },
+    hir::
+        ModuleDescriptor
+    ,
     Cancelable, FilePosition
 };
 
diff --git a/crates/ra_analysis/src/completion/reference_completion.rs b/crates/ra_analysis/src/completion/reference_completion.rs
index ac6ef1d4a..1bf210685 100644
--- a/crates/ra_analysis/src/completion/reference_completion.rs
+++ b/crates/ra_analysis/src/completion/reference_completion.rs
@@ -11,7 +11,7 @@ use crate::{
     db::RootDatabase,
     completion::CompletionItem,
     hir::{
-        module::{ModuleDescriptor},
+        ModuleDescriptor,
         function::FnScopes,
         Def,
         Path,
diff --git a/crates/ra_analysis/src/hir/mod.rs b/crates/ra_analysis/src/hir/mod.rs
index dc52fa4ef..2035c2d23 100644
--- a/crates/ra_analysis/src/hir/mod.rs
+++ b/crates/ra_analysis/src/hir/mod.rs
@@ -6,7 +6,7 @@
 //! applied. So, there relation between syntax and HIR is many-to-one.
 
 pub(crate) mod function;
-pub(crate) mod module;
+mod module;
 pub(crate) mod db;
 mod path;
 mod query_definitions;
@@ -26,7 +26,7 @@ use crate::{
 
 pub(crate) use self::{
     path::{Path, PathKind},
-    module::{ModuleDescriptor, nameres::FileItemId},
+    module::{ModuleDescriptor, ModuleId, Problem, nameres::FileItemId},
     function::FunctionDescriptor,
 };
 
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index ad4b40c58..1b7e16ff4 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -22,7 +22,7 @@ use crate::{
     hir::{
         FunctionDescriptor, ModuleDescriptor,
         function::FnDescriptor,
-        module::{Problem},
+        Problem,
         DeclarationDescriptor,
     },
     input::{FilesDatabase, SourceRoot, SourceRootId, WORKSPACE},
diff --git a/crates/ra_analysis/src/loc2id.rs b/crates/ra_analysis/src/loc2id.rs
index 40da83665..8af7b642b 100644
--- a/crates/ra_analysis/src/loc2id.rs
+++ b/crates/ra_analysis/src/loc2id.rs
@@ -9,8 +9,7 @@ use rustc_hash::FxHashMap;
 
 use crate::{
     FileId,
-    hir::FileItemId,
-    hir::module::ModuleId,
+    hir::{FileItemId, ModuleId},
     syntax_ptr::SyntaxPtr,
     input::SourceRootId,
 };