From 2a5254c106df41dc53c34508e9f5ba77243b7a51 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 29 Oct 2019 15:25:46 +0300
Subject: reduce visibility

---
 crates/ra_hir/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/lib.rs')

diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index ca261e8f5..227e93183 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -80,7 +80,7 @@ pub use self::{
     path::{Path, PathKind},
     resolve::ScopeDef,
     source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer},
-    source_id::{AstIdMap, ErasedFileAstId},
+    source_id::AstIdMap,
     ty::{
         display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk,
     },
-- 
cgit v1.2.3


From b8b7969bfb261fa86b4c38024f873444145fe7a2 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 29 Oct 2019 15:53:25 +0300
Subject: remove empty module

---
 crates/ra_hir/src/lib.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'crates/ra_hir/src/lib.rs')

diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 227e93183..5762b9e52 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -35,7 +35,6 @@ pub mod mock;
 mod path;
 pub mod source_binder;
 
-mod source_id;
 mod ids;
 mod name;
 mod nameres;
@@ -60,14 +59,13 @@ pub mod from_source;
 #[cfg(test)]
 mod marks;
 
-use crate::{
-    ids::MacroFileKind,
-    name::AsName,
-    resolve::Resolver,
-    source_id::{AstId, FileAstId},
-};
+use hir_expand::{ast_id_map::FileAstId, AstId};
+
+use crate::{ids::MacroFileKind, name::AsName, resolve::Resolver};
+
+use hir_expand::ast_id_map::AstIdMap;
 
-pub use self::{
+pub use crate::{
     adt::VariantDef,
     either::Either,
     expr::ExprScopes,
@@ -80,7 +78,6 @@ pub use self::{
     path::{Path, PathKind},
     resolve::ScopeDef,
     source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer},
-    source_id::AstIdMap,
     ty::{
         display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk,
     },
-- 
cgit v1.2.3


From bca708ba4c5eb474448ef2f2882a66ec935f2fee Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 29 Oct 2019 16:19:08 +0300
Subject: cleanup

---
 crates/ra_hir/src/lib.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'crates/ra_hir/src/lib.rs')

diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 5762b9e52..0f2d233bb 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -59,12 +59,13 @@ pub mod from_source;
 #[cfg(test)]
 mod marks;
 
-use hir_expand::{ast_id_map::FileAstId, AstId};
+use hir_expand::{
+    ast_id_map::{AstIdMap, FileAstId},
+    AstId,
+};
 
 use crate::{ids::MacroFileKind, name::AsName, resolve::Resolver};
 
-use hir_expand::ast_id_map::AstIdMap;
-
 pub use crate::{
     adt::VariantDef,
     either::Either,
-- 
cgit v1.2.3