diff options
author | Aleksey Kladov <[email protected]> | 2020-08-13 09:52:31 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-13 09:52:31 +0100 |
commit | 882e1a95ea6844d3e3fc3a47afdd44d145630c49 (patch) | |
tree | 35a33a55c4715c255914d5104b25f2f21862c49d /crates/ra_db | |
parent | e30be7ad15272746e761a29cb1829defecd231cc (diff) | |
parent | 7d9480c6eb43b3ef1bd75ad26e99c14cca5cb366 (diff) |
Merge pull request #5738 from matklad/cfg
Rename ra_cfg -> cfg
Diffstat (limited to 'crates/ra_db')
-rw-r--r-- | crates/ra_db/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_db/src/fixture.rs | 2 | ||||
-rw-r--r-- | crates/ra_db/src/input.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index 156ea1ee4..ad432f096 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml | |||
@@ -13,7 +13,7 @@ salsa = "0.15.2" | |||
13 | rustc-hash = "1.1.0" | 13 | rustc-hash = "1.1.0" |
14 | 14 | ||
15 | syntax = { path = "../syntax" } | 15 | syntax = { path = "../syntax" } |
16 | ra_cfg = { path = "../ra_cfg" } | 16 | cfg = { path = "../cfg" } |
17 | profile = { path = "../profile" } | 17 | profile = { path = "../profile" } |
18 | tt = { path = "../tt" } | 18 | tt = { path = "../tt" } |
19 | test_utils = { path = "../test_utils" } | 19 | test_utils = { path = "../test_utils" } |
diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs index 2aafb9965..5ff8ead0e 100644 --- a/crates/ra_db/src/fixture.rs +++ b/crates/ra_db/src/fixture.rs | |||
@@ -59,7 +59,7 @@ | |||
59 | //! ``` | 59 | //! ``` |
60 | use std::{str::FromStr, sync::Arc}; | 60 | use std::{str::FromStr, sync::Arc}; |
61 | 61 | ||
62 | use ra_cfg::CfgOptions; | 62 | use cfg::CfgOptions; |
63 | use rustc_hash::FxHashMap; | 63 | use rustc_hash::FxHashMap; |
64 | use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER}; | 64 | use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER}; |
65 | use vfs::{file_set::FileSet, VfsPath}; | 65 | use vfs::{file_set::FileSet, VfsPath}; |
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs index 12a863499..f3d65cdf0 100644 --- a/crates/ra_db/src/input.rs +++ b/crates/ra_db/src/input.rs | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | use std::{fmt, iter::FromIterator, ops, str::FromStr, sync::Arc}; | 9 | use std::{fmt, iter::FromIterator, ops, str::FromStr, sync::Arc}; |
10 | 10 | ||
11 | use ra_cfg::CfgOptions; | 11 | use cfg::CfgOptions; |
12 | use rustc_hash::{FxHashMap, FxHashSet}; | 12 | use rustc_hash::{FxHashMap, FxHashSet}; |
13 | use syntax::SmolStr; | 13 | use syntax::SmolStr; |
14 | use tt::TokenExpander; | 14 | use tt::TokenExpander; |