diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-17 11:17:46 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-17 11:17:46 +0000 |
commit | 168c46ab777f6e3263bb2e58f0ce9b0b1619114e (patch) | |
tree | 0723f5b15899902811d027587a46698016d21d54 /crates/ra_hir/src/ty | |
parent | 454cc313589fb17de92d6f3dbf576a5ea5f4adf2 (diff) | |
parent | a2ca03d10b093ea20d7db8bfd78aa1e787482cc0 (diff) |
Merge #561
561: :arrow_up: salsa r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty')
-rw-r--r-- | crates/ra_hir/src/ty/tests.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index affd63a85..a430cbe88 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs | |||
@@ -3,9 +3,7 @@ use std::fmt::Write; | |||
3 | use std::path::{PathBuf, Path}; | 3 | use std::path::{PathBuf, Path}; |
4 | use std::fs; | 4 | use std::fs; |
5 | 5 | ||
6 | use salsa::Database; | 6 | use ra_db::{SyntaxDatabase, salsa::Database}; |
7 | |||
8 | use ra_db::SyntaxDatabase; | ||
9 | use ra_syntax::ast::{self, AstNode}; | 7 | use ra_syntax::ast::{self, AstNode}; |
10 | use test_utils::{project_dir, assert_eq_text, read_text}; | 8 | use test_utils::{project_dir, assert_eq_text, read_text}; |
11 | 9 | ||