diff options
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
-rw-r--r-- | crates/ra_hir/src/lib.rs | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 0f2d233bb..603b0c3dc 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -26,24 +26,19 @@ macro_rules! impl_froms { | |||
26 | } | 26 | } |
27 | } | 27 | } |
28 | 28 | ||
29 | mod either; | ||
30 | pub mod debug; | 29 | pub mod debug; |
31 | 30 | ||
32 | pub mod db; | 31 | pub mod db; |
33 | #[macro_use] | 32 | #[macro_use] |
34 | pub mod mock; | 33 | pub mod mock; |
35 | mod path; | ||
36 | pub mod source_binder; | 34 | pub mod source_binder; |
37 | 35 | ||
38 | mod ids; | 36 | mod ids; |
39 | mod name; | ||
40 | mod nameres; | 37 | mod nameres; |
41 | mod adt; | 38 | mod adt; |
42 | mod traits; | 39 | mod traits; |
43 | mod type_alias; | 40 | mod type_alias; |
44 | mod type_ref; | ||
45 | mod ty; | 41 | mod ty; |
46 | mod attr; | ||
47 | mod impl_block; | 42 | mod impl_block; |
48 | mod expr; | 43 | mod expr; |
49 | mod lang_item; | 44 | mod lang_item; |
@@ -59,36 +54,34 @@ pub mod from_source; | |||
59 | #[cfg(test)] | 54 | #[cfg(test)] |
60 | mod marks; | 55 | mod marks; |
61 | 56 | ||
62 | use hir_expand::{ | 57 | use hir_expand::AstId; |
63 | ast_id_map::{AstIdMap, FileAstId}, | ||
64 | AstId, | ||
65 | }; | ||
66 | 58 | ||
67 | use crate::{ids::MacroFileKind, name::AsName, resolve::Resolver}; | 59 | use crate::{ids::MacroFileKind, resolve::Resolver}; |
68 | 60 | ||
69 | pub use crate::{ | 61 | pub use crate::{ |
70 | adt::VariantDef, | 62 | adt::VariantDef, |
71 | either::Either, | 63 | code_model::{ |
64 | docs::{DocDef, Docs, Documentation}, | ||
65 | src::{HasBodySource, HasSource, Source}, | ||
66 | Adt, AssocItem, BuiltinType, Const, ConstData, Container, Crate, CrateDependency, | ||
67 | DefWithBody, Enum, EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, | ||
68 | ModuleDef, ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union, | ||
69 | }, | ||
72 | expr::ExprScopes, | 70 | expr::ExprScopes, |
73 | from_source::FromSource, | 71 | from_source::FromSource, |
74 | generics::{GenericDef, GenericParam, GenericParams, HasGenericParams}, | 72 | generics::{GenericDef, GenericParam, GenericParams, HasGenericParams}, |
75 | ids::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile}, | 73 | ids::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile}, |
76 | impl_block::ImplBlock, | 74 | impl_block::ImplBlock, |
77 | name::Name, | ||
78 | nameres::{ImportId, Namespace, PerNs}, | 75 | nameres::{ImportId, Namespace, PerNs}, |
79 | path::{Path, PathKind}, | ||
80 | resolve::ScopeDef, | 76 | resolve::ScopeDef, |
81 | source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, | 77 | source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, |
82 | ty::{ | 78 | ty::{ |
83 | display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk, | 79 | display::HirDisplay, ApplicationTy, CallableDef, Substs, TraitRef, Ty, TypeCtor, TypeWalk, |
84 | }, | 80 | }, |
85 | type_ref::Mutability, | ||
86 | }; | 81 | }; |
87 | 82 | ||
88 | pub use self::code_model::{ | 83 | pub use hir_def::{ |
89 | docs::{DocDef, Docs, Documentation}, | 84 | path::{Path, PathKind}, |
90 | src::{HasBodySource, HasSource, Source}, | 85 | type_ref::Mutability, |
91 | Adt, AssocItem, BuiltinType, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, | ||
92 | Enum, EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, ModuleDef, | ||
93 | ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union, | ||
94 | }; | 86 | }; |
87 | pub use hir_expand::{either::Either, name::Name}; | ||