diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 227e931833f..5762b9e52f6 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs @@ -35,7 +35,6 @@ fn from(it: $sv) -> $e { mod path; pub mod source_binder; -mod source_id; mod ids; mod name; mod nameres; @@ -60,14 +59,13 @@ fn from(it: $sv) -> $e { #[cfg(test)] mod marks; -use crate::{ - ids::MacroFileKind, - name::AsName, - resolve::Resolver, - source_id::{AstId, FileAstId}, -}; +use hir_expand::{ast_id_map::FileAstId, AstId}; -pub use self::{ +use crate::{ids::MacroFileKind, name::AsName, resolve::Resolver}; + +use hir_expand::ast_id_map::AstIdMap; + +pub use crate::{ adt::VariantDef, either::Either, expr::ExprScopes, @@ -80,7 +78,6 @@ fn from(it: $sv) -> $e { path::{Path, PathKind}, resolve::ScopeDef, source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, - source_id::AstIdMap, ty::{ display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk, }, diff --git a/crates/ra_hir/src/source_id.rs b/crates/ra_hir/src/source_id.rs deleted file mode 100644 index 463b1d45352..00000000000 --- a/crates/ra_hir/src/source_id.rs +++ /dev/null @@ -1,6 +0,0 @@ -//! FIXME: write short doc here - -pub use hir_expand::{ - ast_id_map::{AstIdMap, FileAstId}, - AstId, -};