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/resolve.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'crates/ra_hir/src/resolve.rs') diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index 7f8b3812c..fc981e9b3 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs @@ -4,16 +4,19 @@ use std::sync::Arc; use rustc_hash::{FxHashMap, FxHashSet}; use crate::{ - ModuleDef, Trait, MacroDef, code_model::Crate, db::HirDatabase, - name::{Name, KnownName}, - nameres::{PerNs, CrateDefMap, CrateModuleId}, + either::Either, + expr::{ + scope::{ExprScopes, ScopeId}, + PatId, + }, generics::GenericParams, - expr::{scope::{ExprScopes, ScopeId}, PatId}, impl_block::ImplBlock, + name::{KnownName, Name}, + nameres::{CrateDefMap, CrateModuleId, PerNs}, path::Path, - either::Either, + MacroDef, ModuleDef, Trait, }; #[derive(Debug, Clone, Default)] -- cgit v1.2.3