1 files changed, 16 insertions, 24 deletions

diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index ca261e8f5..40f5562b4 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -26,25 +26,19 @@ macro_rules! impl_froms {
     }
 }
 
-mod either;
 pub mod debug;
 
 pub mod db;
 #[macro_use]
 pub mod mock;
-mod path;
 pub mod source_binder;
 
-mod source_id;
 mod ids;
-mod name;
 mod nameres;
 mod adt;
 mod traits;
 mod type_alias;
-mod type_ref;
 mod ty;
-mod attr;
 mod impl_block;
 mod expr;
 mod lang_item;
@@ -60,37 +54,35 @@ pub mod from_source;
 #[cfg(test)]
 mod marks;
 
-use crate::{
-    ids::MacroFileKind,
-    name::AsName,
-    resolve::Resolver,
-    source_id::{AstId, FileAstId},
-};
+use hir_expand::AstId;
+
+use crate::{ids::MacroFileKind, resolve::Resolver};
 
-pub use self::{
+pub use crate::{
     adt::VariantDef,
-    either::Either,
+    code_model::{
+        docs::{DocDef, Docs, Documentation},
+        src::{HasBodySource, HasSource, Source},
+        Adt, AssocItem, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum,
+        EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, ModuleDef,
+        ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union,
+    },
     expr::ExprScopes,
     from_source::FromSource,
     generics::{GenericDef, GenericParam, GenericParams, HasGenericParams},
     ids::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile},
     impl_block::ImplBlock,
-    name::Name,
     nameres::{ImportId, Namespace, PerNs},
-    path::{Path, PathKind},
     resolve::ScopeDef,
     source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer},
-    source_id::{AstIdMap, ErasedFileAstId},
     ty::{
         display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk,
     },
-    type_ref::Mutability,
 };
 
-pub use self::code_model::{
-    docs::{DocDef, Docs, Documentation},
-    src::{HasBodySource, HasSource, Source},
-    Adt, AssocItem, BuiltinType, Const, ConstData, Container, Crate, CrateDependency, DefWithBody,
-    Enum, EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, ModuleDef,
-    ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union,
+pub use hir_def::{
+    builtin_type::BuiltinType,
+    path::{Path, PathKind},
+    type_ref::Mutability,
 };
+pub use hir_expand::{either::Either, name::Name};