From c71740e95681c23f160bf63185679f70fb9c9dda Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sun, 24 Feb 2019 15:12:10 +0100 Subject: Clean up imports a bit --- crates/ra_hir/src/code_model_api.rs | 6 ++---- crates/ra_hir/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir') 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}; use crate::{ Name, ScopesWithSyntaxMapping, Ty, HirFileId, - type_ref::TypeRef, - nameres::{ModuleScope, lower::ImportId}, HirDatabase, PersistentHirDatabase, + type_ref::TypeRef, + nameres::{ModuleScope, Namespace, lower::ImportId}, expr::{Body, BodySyntaxMapping}, ty::InferenceResult, adt::{EnumVariantId, StructFieldId, VariantDef}, @@ -429,8 +429,6 @@ pub struct Function { pub(crate) id: FunctionId, } -pub use crate::{ nameres::Namespace, expr::ScopeEntryWithSyntax}; - /// The declared signature of a function. #[derive(Debug, Clone, PartialEq, Eq)] 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::{ impl_block::{ImplBlock, ImplItem}, docs::{Docs, Documentation}, adt::AdtDef, - expr::{ExprScopes, ScopesWithSyntaxMapping}, + expr::{ExprScopes, ScopesWithSyntaxMapping, ScopeEntryWithSyntax}, resolve::{Resolver, Resolution}, }; @@ -68,7 +68,7 @@ pub use self::code_model_api::{ Def, Module, ModuleDef, ModuleSource, Problem, Struct, Enum, EnumVariant, - Function, FnSignature, ScopeEntryWithSyntax, + Function, FnSignature, StructField, FieldSource, Static, Const, Trait, Type, -- cgit v1.2.3