diff options
Diffstat (limited to 'crates/ra_db')
-rw-r--r-- | crates/ra_db/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_db/src/input.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index 9cb9ba11c..47a0f6248 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml | |||
@@ -15,7 +15,7 @@ rustc-hash = "1.1.0" | |||
15 | ra_syntax = { path = "../ra_syntax" } | 15 | ra_syntax = { path = "../ra_syntax" } |
16 | ra_cfg = { path = "../ra_cfg" } | 16 | ra_cfg = { path = "../ra_cfg" } |
17 | profile = { path = "../profile" } | 17 | profile = { path = "../profile" } |
18 | ra_tt = { path = "../ra_tt" } | 18 | tt = { path = "../tt" } |
19 | test_utils = { path = "../test_utils" } | 19 | test_utils = { path = "../test_utils" } |
20 | vfs = { path = "../vfs" } | 20 | vfs = { path = "../vfs" } |
21 | stdx = { path = "../stdx" } | 21 | stdx = { path = "../stdx" } |
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs index 6f2e5cfc7..02a1abee0 100644 --- a/crates/ra_db/src/input.rs +++ b/crates/ra_db/src/input.rs | |||
@@ -10,8 +10,8 @@ use std::{fmt, iter::FromIterator, ops, str::FromStr, sync::Arc}; | |||
10 | 10 | ||
11 | use ra_cfg::CfgOptions; | 11 | use ra_cfg::CfgOptions; |
12 | use ra_syntax::SmolStr; | 12 | use ra_syntax::SmolStr; |
13 | use ra_tt::TokenExpander; | ||
14 | use rustc_hash::{FxHashMap, FxHashSet}; | 13 | use rustc_hash::{FxHashMap, FxHashSet}; |
14 | use tt::TokenExpander; | ||
15 | use vfs::file_set::FileSet; | 15 | use vfs::file_set::FileSet; |
16 | 16 | ||
17 | pub use vfs::FileId; | 17 | pub use vfs::FileId; |
@@ -156,7 +156,7 @@ impl CrateGraph { | |||
156 | display_name: Option<String>, | 156 | display_name: Option<String>, |
157 | cfg_options: CfgOptions, | 157 | cfg_options: CfgOptions, |
158 | env: Env, | 158 | env: Env, |
159 | proc_macro: Vec<(SmolStr, Arc<dyn ra_tt::TokenExpander>)>, | 159 | proc_macro: Vec<(SmolStr, Arc<dyn tt::TokenExpander>)>, |
160 | ) -> CrateId { | 160 | ) -> CrateId { |
161 | let proc_macro = | 161 | let proc_macro = |
162 | proc_macro.into_iter().map(|(name, it)| ProcMacro { name, expander: it }).collect(); | 162 | proc_macro.into_iter().map(|(name, it)| ProcMacro { name, expander: it }).collect(); |