aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r--crates/ra_hir/src/lib.rs15
-rw-r--r--crates/ra_hir/src/source_id.rs6
2 files changed, 6 insertions, 15 deletions
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;
35mod path; 35mod path;
36pub mod source_binder; 36pub mod source_binder;
37 37
38mod source_id;
39mod ids; 38mod ids;
40mod name; 39mod name;
41mod nameres; 40mod nameres;
@@ -60,14 +59,13 @@ pub mod from_source;
60#[cfg(test)] 59#[cfg(test)]
61mod marks; 60mod marks;
62 61
63use crate::{ 62use hir_expand::{ast_id_map::FileAstId, AstId};
64 ids::MacroFileKind, 63
65 name::AsName, 64use crate::{ids::MacroFileKind, name::AsName, resolve::Resolver};
66 resolve::Resolver, 65
67 source_id::{AstId, FileAstId}, 66use hir_expand::ast_id_map::AstIdMap;
68};
69 67
70pub use self::{ 68pub use crate::{
71 adt::VariantDef, 69 adt::VariantDef,
72 either::Either, 70 either::Either,
73 expr::ExprScopes, 71 expr::ExprScopes,
@@ -80,7 +78,6 @@ pub use self::{
80 path::{Path, PathKind}, 78 path::{Path, PathKind},
81 resolve::ScopeDef, 79 resolve::ScopeDef,
82 source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, 80 source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer},
83 source_id::AstIdMap,
84 ty::{ 81 ty::{
85 display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk, 82 display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk,
86 }, 83 },
diff --git a/crates/ra_hir/src/source_id.rs b/crates/ra_hir/src/source_id.rs
deleted file mode 100644
index 463b1d453..000000000
--- a/crates/ra_hir/src/source_id.rs
+++ /dev/null
@@ -1,6 +0,0 @@
1//! FIXME: write short doc here
2
3pub use hir_expand::{
4 ast_id_map::{AstIdMap, FileAstId},
5 AstId,
6};