From 475367d08a0b5e8ed4d6c7c7d43947fd11b26bb7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 26 Nov 2019 18:06:12 +0300 Subject: Cleanup imports --- crates/ra_hir/src/ty.rs | 10 ++++++---- crates/ra_hir/src/ty/lower.rs | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index 3711068fa..e420c796f 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs @@ -19,14 +19,16 @@ use std::sync::Arc; use std::{fmt, iter, mem}; use hir_def::{ - generics::GenericParams, AdtId, ContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, - TraitId, TypeAliasId, + expr::ExprId, generics::GenericParams, type_ref::Mutability, AdtId, ContainerId, DefWithBodyId, + GenericDefId, HasModule, Lookup, TraitId, TypeAliasId, }; use ra_db::{impl_intern_key, salsa}; use crate::{ - db::HirDatabase, expr::ExprId, util::make_mut_slice, Adt, Crate, FloatTy, IntTy, Mutability, - Name, Uncertain, + db::HirDatabase, + ty::primitive::{FloatTy, IntTy, Uncertain}, + util::make_mut_slice, + Adt, Crate, Name, }; use display::{HirDisplay, HirFormatter}; diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs index a7149614d..c3c47a576 100644 --- a/crates/ra_hir/src/ty/lower.rs +++ b/crates/ra_hir/src/ty/lower.rs @@ -29,10 +29,9 @@ use crate::{ ty::{ primitive::{FloatTy, IntTy}, utils::{all_super_traits, associated_type_by_name_including_super_traits}, - Adt, }, util::make_mut_slice, - Const, Enum, EnumVariant, Function, ImplBlock, ModuleDef, Path, Static, Struct, Trait, + Adt, Const, Enum, EnumVariant, Function, ImplBlock, ModuleDef, Path, Static, Struct, Trait, TypeAlias, Union, }; -- cgit v1.2.3