diff options
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r-- | crates/ra_hir/src/code_model_api.rs | 6 | ||||
-rw-r--r-- | crates/ra_hir/src/lib.rs | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs index 9d0b40ce0..0779a08a9 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs | |||
@@ -6,9 +6,9 @@ use ra_syntax::{ast::self, TreeArc, SyntaxNode}; | |||
6 | 6 | ||
7 | use crate::{ | 7 | use crate::{ |
8 | Name, ScopesWithSyntaxMapping, Ty, HirFileId, | 8 | Name, ScopesWithSyntaxMapping, Ty, HirFileId, |
9 | type_ref::TypeRef, | ||
10 | nameres::{ModuleScope, lower::ImportId}, | ||
11 | HirDatabase, PersistentHirDatabase, | 9 | HirDatabase, PersistentHirDatabase, |
10 | type_ref::TypeRef, | ||
11 | nameres::{ModuleScope, Namespace, lower::ImportId}, | ||
12 | expr::{Body, BodySyntaxMapping}, | 12 | expr::{Body, BodySyntaxMapping}, |
13 | ty::InferenceResult, | 13 | ty::InferenceResult, |
14 | adt::{EnumVariantId, StructFieldId, VariantDef}, | 14 | adt::{EnumVariantId, StructFieldId, VariantDef}, |
@@ -429,8 +429,6 @@ pub struct Function { | |||
429 | pub(crate) id: FunctionId, | 429 | pub(crate) id: FunctionId, |
430 | } | 430 | } |
431 | 431 | ||
432 | pub use crate::{ nameres::Namespace, expr::ScopeEntryWithSyntax}; | ||
433 | |||
434 | /// The declared signature of a function. | 432 | /// The declared signature of a function. |
435 | #[derive(Debug, Clone, PartialEq, Eq)] | 433 | #[derive(Debug, Clone, PartialEq, Eq)] |
436 | pub struct FnSignature { | 434 | pub struct FnSignature { |
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index b212c3399..2830d4a99 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -59,7 +59,7 @@ pub use self::{ | |||
59 | impl_block::{ImplBlock, ImplItem}, | 59 | impl_block::{ImplBlock, ImplItem}, |
60 | docs::{Docs, Documentation}, | 60 | docs::{Docs, Documentation}, |
61 | adt::AdtDef, | 61 | adt::AdtDef, |
62 | expr::{ExprScopes, ScopesWithSyntaxMapping}, | 62 | expr::{ExprScopes, ScopesWithSyntaxMapping, ScopeEntryWithSyntax}, |
63 | resolve::{Resolver, Resolution}, | 63 | resolve::{Resolver, Resolution}, |
64 | }; | 64 | }; |
65 | 65 | ||
@@ -68,7 +68,7 @@ pub use self::code_model_api::{ | |||
68 | Def, | 68 | Def, |
69 | Module, ModuleDef, ModuleSource, Problem, | 69 | Module, ModuleDef, ModuleSource, Problem, |
70 | Struct, Enum, EnumVariant, | 70 | Struct, Enum, EnumVariant, |
71 | Function, FnSignature, ScopeEntryWithSyntax, | 71 | Function, FnSignature, |
72 | StructField, FieldSource, | 72 | StructField, FieldSource, |
73 | Static, Const, | 73 | Static, Const, |
74 | Trait, Type, | 74 | Trait, Type, |