diff options
author | Aleksey Kladov <[email protected]> | 2019-01-17 11:11:00 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-17 11:11:00 +0000 |
commit | a2ca03d10b093ea20d7db8bfd78aa1e787482cc0 (patch) | |
tree | 0723f5b15899902811d027587a46698016d21d54 /crates/ra_hir/src/mock.rs | |
parent | 454cc313589fb17de92d6f3dbf576a5ea5f4adf2 (diff) |
:arrow_up: salsa
Diffstat (limited to 'crates/ra_hir/src/mock.rs')
-rw-r--r-- | crates/ra_hir/src/mock.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs index 9371c5a0d..a83a5c6cc 100644 --- a/crates/ra_hir/src/mock.rs +++ b/crates/ra_hir/src/mock.rs | |||
@@ -1,8 +1,10 @@ | |||
1 | use std::{sync::Arc, panic}; | 1 | use std::{sync::Arc, panic}; |
2 | 2 | ||
3 | use parking_lot::Mutex; | 3 | use parking_lot::Mutex; |
4 | use salsa::{self, Database}; | 4 | use ra_db::{ |
5 | use ra_db::{LocationIntener, BaseDatabase, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId}; | 5 | LocationIntener, BaseDatabase, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, |
6 | salsa::{self, Database}, | ||
7 | }; | ||
6 | use relative_path::RelativePathBuf; | 8 | use relative_path::RelativePathBuf; |
7 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; | 9 | use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset}; |
8 | 10 | ||
@@ -220,10 +222,10 @@ salsa::database_storage! { | |||
220 | } | 222 | } |
221 | impl db::HirDatabase { | 223 | impl db::HirDatabase { |
222 | fn hir_source_file() for db::HirSourceFileQuery; | 224 | fn hir_source_file() for db::HirSourceFileQuery; |
223 | fn expand_macro_invocation() for db::ExpandMacroCallQuery; | 225 | fn expand_macro_invocation() for db::ExpandMacroInvocationQuery; |
224 | fn module_tree() for db::ModuleTreeQuery; | 226 | fn module_tree() for db::ModuleTreeQuery; |
225 | fn fn_scopes() for db::FnScopesQuery; | 227 | fn fn_scopes() for db::FnScopesQuery; |
226 | fn file_items() for db::SourceFileItemsQuery; | 228 | fn file_items() for db::FileItemsQuery; |
227 | fn file_item() for db::FileItemQuery; | 229 | fn file_item() for db::FileItemQuery; |
228 | fn input_module_items() for db::InputModuleItemsQuery; | 230 | fn input_module_items() for db::InputModuleItemsQuery; |
229 | fn item_map() for db::ItemMapQuery; | 231 | fn item_map() for db::ItemMapQuery; |