aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/lib.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-17 11:17:46 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-17 11:17:46 +0000
commit168c46ab777f6e3263bb2e58f0ce9b0b1619114e (patch)
tree0723f5b15899902811d027587a46698016d21d54 /crates/ra_ide_api/src/lib.rs
parent454cc313589fb17de92d6f3dbf576a5ea5f4adf2 (diff)
parenta2ca03d10b093ea20d7db8bfd78aa1e787482cc0 (diff)
Merge #561
561: :arrow_up: salsa r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/lib.rs')
-rw-r--r--crates/ra_ide_api/src/lib.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 3a0d2dbbe..7b47d7b6d 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -28,11 +28,13 @@ use std::{fmt, sync::Arc};
28 28
29use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit}; 29use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit};
30use ra_text_edit::TextEdit; 30use ra_text_edit::TextEdit;
31use ra_db::{SyntaxDatabase, FilesDatabase, BaseDatabase}; 31use ra_db::{
32 SyntaxDatabase, FilesDatabase, BaseDatabase,
33 salsa::{self, ParallelDatabase},
34};
32use rayon::prelude::*; 35use rayon::prelude::*;
33use relative_path::RelativePathBuf; 36use relative_path::RelativePathBuf;
34use rustc_hash::FxHashMap; 37use rustc_hash::FxHashMap;
35use salsa::ParallelDatabase;
36 38
37use crate::{ 39use crate::{
38 symbol_index::{FileSymbol, SymbolIndex}, 40 symbol_index::{FileSymbol, SymbolIndex},