From 1834bae5b86c54ed9dece26e82436919d59e6cb7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 4 Jul 2019 23:05:17 +0300 Subject: allow rustfmt to reorder imports This wasn't a right decision in the first place, the feature flag was broken in the last rustfmt release, and syntax highlighting of imports is more important anyway --- crates/ra_hir/src/ty/lower.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'crates/ra_hir/src/ty/lower.rs') diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs index cb494baf4..8b1b2a7f9 100644 --- a/crates/ra_hir/src/ty/lower.rs +++ b/crates/ra_hir/src/ty/lower.rs @@ -5,23 +5,22 @@ //! - Building the type for an item: This happens through the `type_for_def` query. //! //! This usually involves resolving names, collecting generic arguments etc. -use std::sync::Arc; use std::iter; +use std::sync::Arc; +use super::{FnSig, GenericPredicate, Substs, TraitRef, Ty, TypeCtor}; use crate::{ - Function, Struct, Union, StructField, Enum, EnumVariant, Path, ModuleDef, TypeAlias, Const, Static, - HirDatabase, BuiltinType, - type_ref::TypeRef, - nameres::Namespace, - resolve::{Resolver, Resolution}, - path::{PathSegment, GenericArg}, - generics::{HasGenericParams}, adt::VariantDef, - Trait, - generics::{WherePredicate, GenericDef}, + generics::HasGenericParams, + generics::{GenericDef, WherePredicate}, + nameres::Namespace, + path::{GenericArg, PathSegment}, + resolve::{Resolution, Resolver}, ty::AdtDef, + type_ref::TypeRef, + BuiltinType, Const, Enum, EnumVariant, Function, HirDatabase, ModuleDef, Path, Static, Struct, + StructField, Trait, TypeAlias, Union, }; -use super::{Ty, FnSig, Substs, TypeCtor, TraitRef, GenericPredicate}; impl Ty { pub(crate) fn from_hir(db: &impl HirDatabase, resolver: &Resolver, type_ref: &TypeRef) -> Self { -- cgit v1.2.3