diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-13 15:31:49 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-13 15:31:49 +0100 |
commit | e9926948ca267932ccc1341388bfd1b3fa88a001 (patch) | |
tree | cc4b797cb39a40b59e9e3d37178e8a1907f12358 /crates/ra_hir_ty/src/test_db.rs | |
parent | 902f74c2697cc2a50de9067845814a2a852fccfd (diff) | |
parent | 50f8c1ebf23f634b68529603a917e3feeda457fa (diff) |
Merge #5747
5747: Rename crate r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/test_db.rs')
-rw-r--r-- | crates/ra_hir_ty/src/test_db.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs index 0e2a69eec..15b8435e9 100644 --- a/crates/ra_hir_ty/src/test_db.rs +++ b/crates/ra_hir_ty/src/test_db.rs | |||
@@ -5,16 +5,16 @@ use std::{ | |||
5 | sync::{Arc, Mutex}, | 5 | sync::{Arc, Mutex}, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | use base_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast}; | ||
8 | use hir_def::{db::DefDatabase, ModuleId}; | 9 | use hir_def::{db::DefDatabase, ModuleId}; |
9 | use hir_expand::db::AstDatabase; | 10 | use hir_expand::db::AstDatabase; |
10 | use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast}; | ||
11 | use rustc_hash::{FxHashMap, FxHashSet}; | 11 | use rustc_hash::{FxHashMap, FxHashSet}; |
12 | use syntax::TextRange; | 12 | use syntax::TextRange; |
13 | use test_utils::extract_annotations; | 13 | use test_utils::extract_annotations; |
14 | 14 | ||
15 | #[salsa::database( | 15 | #[salsa::database( |
16 | ra_db::SourceDatabaseExtStorage, | 16 | base_db::SourceDatabaseExtStorage, |
17 | ra_db::SourceDatabaseStorage, | 17 | base_db::SourceDatabaseStorage, |
18 | hir_expand::db::AstDatabaseStorage, | 18 | hir_expand::db::AstDatabaseStorage, |
19 | hir_def::db::InternDatabaseStorage, | 19 | hir_def::db::InternDatabaseStorage, |
20 | hir_def::db::DefDatabaseStorage, | 20 | hir_def::db::DefDatabaseStorage, |