aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/db.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/db.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/db.rs')
-rw-r--r--crates/ra_hir/src/db.rs28
1 files changed, 15 insertions, 13 deletions
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 @@
1use std::sync::Arc; 1use std::sync::Arc;
2 2
3use parking_lot::Mutex; 3use parking_lot::Mutex;
4use ra_syntax::{SyntaxNode, TreeArc, SmolStr, ast}; 4use ra_db::{salsa, SourceDatabase};
5use ra_db::{SourceDatabase, salsa}; 5use ra_syntax::{ast, SmolStr, SyntaxNode, TreeArc};
6 6
7use crate::{ 7use crate::{
8 HirFileId, MacroDefId, AstIdMap, ErasedFileAstId, Crate, Module, MacroCallLoc, 8 adt::{EnumData, StructData},
9 Function, FnData, ExprScopes, TypeAlias, 9 generics::{GenericDef, GenericParams},
10 Struct, Enum, StructField,
11 Const, ConstData, Static,
12 DefWithBody, Trait,
13 ids, 10 ids,
14 nameres::{Namespace, ImportSourceMap, RawItems, CrateDefMap}, 11 impl_block::{ImplBlock, ImplSourceMap, ModuleImplBlocks},
15 ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef, CallableDef, FnSig, TypeCtor, GenericPredicate, Substs}, 12 lang_item::{LangItemTarget, LangItems},
16 adt::{StructData, EnumData}, 13 nameres::{CrateDefMap, ImportSourceMap, Namespace, RawItems},
17 impl_block::{ModuleImplBlocks, ImplSourceMap, ImplBlock},
18 generics::{GenericParams, GenericDef},
19 traits::TraitData, 14 traits::TraitData,
20 lang_item::{LangItems, LangItemTarget}, type_alias::TypeAliasData, 15 ty::{
16 method_resolution::CrateImplBlocks, CallableDef, FnSig, GenericPredicate, InferenceResult,
17 Substs, Ty, TypableDef, TypeCtor,
18 },
19 type_alias::TypeAliasData,
20 AstIdMap, Const, ConstData, Crate, DefWithBody, Enum, ErasedFileAstId, ExprScopes, FnData,
21 Function, HirFileId, MacroCallLoc, MacroDefId, Module, Static, Struct, StructField, Trait,
22 TypeAlias,
21}; 23};
22 24
23/// We store all interned things in the single QueryGroup. 25/// We store all interned things in the single QueryGroup.