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_project_model/src | |
parent | e30be7ad15272746e761a29cb1829defecd231cc (diff) | |
parent | 7d9480c6eb43b3ef1bd75ad26e99c14cca5cb366 (diff) |
Merge pull request #5738 from matklad/cfg
Rename ra_cfg -> cfg
Diffstat (limited to 'crates/ra_project_model/src')
-rw-r--r-- | crates/ra_project_model/src/cfg_flag.rs | 2 | ||||
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_project_model/src/cfg_flag.rs b/crates/ra_project_model/src/cfg_flag.rs index bd50056c6..e92962cf6 100644 --- a/crates/ra_project_model/src/cfg_flag.rs +++ b/crates/ra_project_model/src/cfg_flag.rs | |||
@@ -3,7 +3,7 @@ | |||
3 | //! rustc main.rs --cfg foo --cfg 'feature="bar"' | 3 | //! rustc main.rs --cfg foo --cfg 'feature="bar"' |
4 | use std::str::FromStr; | 4 | use std::str::FromStr; |
5 | 5 | ||
6 | use ra_cfg::CfgOptions; | 6 | use cfg::CfgOptions; |
7 | use stdx::split_once; | 7 | use stdx::split_once; |
8 | 8 | ||
9 | #[derive(Clone, Eq, PartialEq, Debug)] | 9 | #[derive(Clone, Eq, PartialEq, Debug)] |
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 46f44910c..ee42198f3 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
@@ -12,8 +12,8 @@ use std::{ | |||
12 | }; | 12 | }; |
13 | 13 | ||
14 | use anyhow::{bail, Context, Result}; | 14 | use anyhow::{bail, Context, Result}; |
15 | use cfg::CfgOptions; | ||
15 | use paths::{AbsPath, AbsPathBuf}; | 16 | use paths::{AbsPath, AbsPathBuf}; |
16 | use ra_cfg::CfgOptions; | ||
17 | use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; | 17 | use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; |
18 | use rustc_hash::{FxHashMap, FxHashSet}; | 18 | use rustc_hash::{FxHashMap, FxHashSet}; |
19 | 19 | ||