7 files changed, 16 insertions, 12 deletions

diff --git a/crates/ra_ide/src/change.rs b/crates/ra_ide/src/change.rs
index 18dad2ea3..a0aeee1f7 100644
--- a/crates/ra_ide/src/change.rs
+++ b/crates/ra_ide/src/change.rs
@@ -15,7 +15,7 @@ use rustc_hash::FxHashMap;
 
 use crate::{
     db::{DebugData, RootDatabase},
-    symbol_index::{SymbolIndex, SymbolsDatabase},
+    ide_db::symbol_index::{SymbolIndex, SymbolsDatabase},
 };
 
 #[derive(Default)]
diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index 5a12a619c..b67e32626 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -12,6 +12,7 @@ use crate::{
     db::RootDatabase,
     display::{ShortLabel, ToNav},
     expand::descend_into_macros,
+    ide_db::symbol_index,
     references::{classify_name_ref, NameKind::*},
     FilePosition, NavigationTarget, RangeInfo,
 };
@@ -94,7 +95,7 @@ pub(crate) fn reference_definition(
     };
 
     // Fallback index based approach:
-    let navs = crate::symbol_index::index_resolve(sb.db, name_ref.value)
+    let navs = symbol_index::index_resolve(sb.db, name_ref.value)
         .into_iter()
         .map(|s| s.to_nav(sb.db))
         .collect();
diff --git a/crates/ra_ide/src/ide_db/mod.rs b/crates/ra_ide/src/ide_db/mod.rs
index 834ad0135..924ee9968 100644
--- a/crates/ra_ide/src/ide_db/mod.rs
+++ b/crates/ra_ide/src/ide_db/mod.rs
@@ -3,6 +3,7 @@
 pub mod line_index;
 pub mod line_index_utils;
 pub mod feature_flags;
+pub mod symbol_index;
 
 use std::sync::Arc;
 
@@ -13,9 +14,8 @@ use ra_db::{
 };
 use rustc_hash::FxHashMap;
 
-use crate::{
-    ide_db::{feature_flags::FeatureFlags, line_index::LineIndex},
-    symbol_index::{self, SymbolsDatabase},
+use crate::ide_db::{
+    feature_flags::FeatureFlags, line_index::LineIndex, symbol_index::SymbolsDatabase,
 };
 
 #[salsa::database(
diff --git a/crates/ra_ide/src/symbol_index.rs b/crates/ra_ide/src/ide_db/symbol_index.rs
index 5729eb5b3..4ceb5e66f 100644
--- a/crates/ra_ide/src/symbol_index.rs
+++ b/crates/ra_ide/src/ide_db/symbol_index.rs
@@ -29,7 +29,7 @@ use std::{
 use fst::{self, Streamer};
 use ra_db::{
     salsa::{self, ParallelDatabase},
-    SourceDatabaseExt, SourceRootId,
+    FileId, SourceDatabaseExt, SourceRootId,
 };
 use ra_syntax::{
     ast::{self, NameOwner},
@@ -40,7 +40,7 @@ use ra_syntax::{
 #[cfg(not(feature = "wasm"))]
 use rayon::prelude::*;
 
-use crate::{db::RootDatabase, FileId, Query};
+use crate::{ide_db::RootDatabase, Query};
 
 #[salsa::query_group(SymbolsDatabaseStorage)]
 pub(crate) trait SymbolsDatabase: hir::db::HirDatabase {
@@ -115,7 +115,7 @@ pub(crate) fn index_resolve(db: &RootDatabase, name_ref: &ast::NameRef) -> Vec<F
     let mut query = Query::new(name.to_string());
     query.exact();
     query.limit(4);
-    crate::symbol_index::world_symbols(db, query)
+    world_symbols(db, query)
 }
 
 #[derive(Default)]
diff --git a/crates/ra_ide/src/imports_locator.rs b/crates/ra_ide/src/imports_locator.rs
index 9e1a1c1ec..9e5e6cadf 100644
--- a/crates/ra_ide/src/imports_locator.rs
+++ b/crates/ra_ide/src/imports_locator.rs
@@ -3,8 +3,8 @@
 
 use crate::{
     db::RootDatabase,
+    ide_db::symbol_index::{self, FileSymbol},
     references::{classify_name, NameDefinition, NameKind},
-    symbol_index::{self, FileSymbol},
     Query,
 };
 use hir::{db::HirDatabase, ModuleDef, SourceBinder};
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 003a5e528..3926bc00f 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -14,7 +14,6 @@ mod ide_db;
 
 mod db;
 pub mod mock_analysis;
-mod symbol_index;
 mod change;
 mod source_change;
 
@@ -59,7 +58,11 @@ use ra_db::{
 };
 use ra_syntax::{SourceFile, TextRange, TextUnit};
 
-use crate::{db::LineIndexDatabase, display::ToNav, symbol_index::FileSymbol};
+use crate::{
+    db::LineIndexDatabase,
+    display::ToNav,
+    ide_db::symbol_index::{self, FileSymbol},
+};
 
 pub use crate::{
     assists::{Assist, AssistId},
diff --git a/crates/ra_ide/src/status.rs b/crates/ra_ide/src/status.rs
index 1bb27eb85..538312086 100644
--- a/crates/ra_ide/src/status.rs
+++ b/crates/ra_ide/src/status.rs
@@ -15,7 +15,7 @@ use ra_syntax::{ast, Parse, SyntaxNode};
 
 use crate::{
     db::RootDatabase,
-    symbol_index::{LibrarySymbolsQuery, SymbolIndex},
+    ide_db::symbol_index::{LibrarySymbolsQuery, SymbolIndex},
     FileId,
 };