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/db.rs | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'crates/ra_hir/src/db.rs') diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index eda22c0b0..a9c6c52d9 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs @@ -1,23 +1,25 @@ use std::sync::Arc; use parking_lot::Mutex; -use ra_syntax::{SyntaxNode, TreeArc, SmolStr, ast}; -use ra_db::{SourceDatabase, salsa}; +use ra_db::{salsa, SourceDatabase}; +use ra_syntax::{ast, SmolStr, SyntaxNode, TreeArc}; use crate::{ - HirFileId, MacroDefId, AstIdMap, ErasedFileAstId, Crate, Module, MacroCallLoc, - Function, FnData, ExprScopes, TypeAlias, - Struct, Enum, StructField, - Const, ConstData, Static, - DefWithBody, Trait, + adt::{EnumData, StructData}, + generics::{GenericDef, GenericParams}, ids, - nameres::{Namespace, ImportSourceMap, RawItems, CrateDefMap}, - ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef, CallableDef, FnSig, TypeCtor, GenericPredicate, Substs}, - adt::{StructData, EnumData}, - impl_block::{ModuleImplBlocks, ImplSourceMap, ImplBlock}, - generics::{GenericParams, GenericDef}, + impl_block::{ImplBlock, ImplSourceMap, ModuleImplBlocks}, + lang_item::{LangItemTarget, LangItems}, + nameres::{CrateDefMap, ImportSourceMap, Namespace, RawItems}, traits::TraitData, - lang_item::{LangItems, LangItemTarget}, type_alias::TypeAliasData, + ty::{ + method_resolution::CrateImplBlocks, CallableDef, FnSig, GenericPredicate, InferenceResult, + Substs, Ty, TypableDef, TypeCtor, + }, + type_alias::TypeAliasData, + AstIdMap, Const, ConstData, Crate, DefWithBody, Enum, ErasedFileAstId, ExprScopes, FnData, + Function, HirFileId, MacroCallLoc, MacroDefId, Module, Static, Struct, StructField, Trait, + TypeAlias, }; /// We store all interned things in the single QueryGroup. -- cgit v1.2.3