aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/resolve.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-07-04 21:05:17 +0100
committerAleksey Kladov <[email protected]>2019-07-04 21:09:09 +0100
commit1834bae5b86c54ed9dece26e82436919d59e6cb7 (patch)
tree92c8b984e874b67fa1831613464bbe356c1af3dd /crates/ra_hir/src/resolve.rs
parent2b2cd829b0f95aef338227deb05ec7503dae9b6c (diff)
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
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r--crates/ra_hir/src/resolve.rs13
1 files changed, 8 insertions, 5 deletions
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;
4use rustc_hash::{FxHashMap, FxHashSet}; 4use rustc_hash::{FxHashMap, FxHashSet};
5 5
6use crate::{ 6use crate::{
7 ModuleDef, Trait, MacroDef,
8 code_model::Crate, 7 code_model::Crate,
9 db::HirDatabase, 8 db::HirDatabase,
10 name::{Name, KnownName}, 9 either::Either,
11 nameres::{PerNs, CrateDefMap, CrateModuleId}, 10 expr::{
11 scope::{ExprScopes, ScopeId},
12 PatId,
13 },
12 generics::GenericParams, 14 generics::GenericParams,
13 expr::{scope::{ExprScopes, ScopeId}, PatId},
14 impl_block::ImplBlock, 15 impl_block::ImplBlock,
16 name::{KnownName, Name},
17 nameres::{CrateDefMap, CrateModuleId, PerNs},
15 path::Path, 18 path::Path,
16 either::Either, 19 MacroDef, ModuleDef, Trait,
17}; 20};
18 21
19#[derive(Debug, Clone, Default)] 22#[derive(Debug, Clone, Default)]