diff options
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
-rw-r--r-- | crates/ra_hir/src/lib.rs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 603b0c3dc..3ba99d92d 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -34,7 +34,6 @@ pub mod mock; | |||
34 | pub mod source_binder; | 34 | pub mod source_binder; |
35 | 35 | ||
36 | mod ids; | 36 | mod ids; |
37 | mod nameres; | ||
38 | mod adt; | 37 | mod adt; |
39 | mod traits; | 38 | mod traits; |
40 | mod type_alias; | 39 | mod type_alias; |
@@ -47,6 +46,7 @@ mod resolve; | |||
47 | pub mod diagnostics; | 46 | pub mod diagnostics; |
48 | mod util; | 47 | mod util; |
49 | 48 | ||
49 | mod from_id; | ||
50 | mod code_model; | 50 | mod code_model; |
51 | 51 | ||
52 | pub mod from_source; | 52 | pub mod from_source; |
@@ -62,17 +62,16 @@ pub use crate::{ | |||
62 | adt::VariantDef, | 62 | adt::VariantDef, |
63 | code_model::{ | 63 | code_model::{ |
64 | docs::{DocDef, Docs, Documentation}, | 64 | docs::{DocDef, Docs, Documentation}, |
65 | src::{HasBodySource, HasSource, Source}, | 65 | src::{HasBodySource, HasSource}, |
66 | Adt, AssocItem, BuiltinType, Const, ConstData, Container, Crate, CrateDependency, | 66 | Adt, AssocItem, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum, |
67 | DefWithBody, Enum, EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, | 67 | EnumVariant, FieldSource, FnData, Function, HasBody, MacroDef, Module, ModuleDef, |
68 | ModuleDef, ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union, | 68 | ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union, |
69 | }, | 69 | }, |
70 | expr::ExprScopes, | 70 | expr::ExprScopes, |
71 | from_source::FromSource, | 71 | from_source::FromSource, |
72 | generics::{GenericDef, GenericParam, GenericParams, HasGenericParams}, | 72 | generics::{GenericDef, GenericParam, GenericParams, HasGenericParams}, |
73 | ids::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile}, | 73 | ids::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile}, |
74 | impl_block::ImplBlock, | 74 | impl_block::ImplBlock, |
75 | nameres::{ImportId, Namespace, PerNs}, | ||
76 | resolve::ScopeDef, | 75 | resolve::ScopeDef, |
77 | source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, | 76 | source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, |
78 | ty::{ | 77 | ty::{ |
@@ -81,7 +80,12 @@ pub use crate::{ | |||
81 | }; | 80 | }; |
82 | 81 | ||
83 | pub use hir_def::{ | 82 | pub use hir_def::{ |
83 | builtin_type::BuiltinType, | ||
84 | nameres::{ | ||
85 | per_ns::{Namespace, PerNs}, | ||
86 | raw::ImportId, | ||
87 | }, | ||
84 | path::{Path, PathKind}, | 88 | path::{Path, PathKind}, |
85 | type_ref::Mutability, | 89 | type_ref::Mutability, |
86 | }; | 90 | }; |
87 | pub use hir_expand::{either::Either, name::Name}; | 91 | pub use hir_expand::{either::Either, name::Name, Source}; |