aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-08-13 09:52:31 +0100
committerGitHub <[email protected]>2020-08-13 09:52:31 +0100
commit882e1a95ea6844d3e3fc3a47afdd44d145630c49 (patch)
tree35a33a55c4715c255914d5104b25f2f21862c49d /crates/ra_project_model
parente30be7ad15272746e761a29cb1829defecd231cc (diff)
parent7d9480c6eb43b3ef1bd75ad26e99c14cca5cb366 (diff)
Merge pull request #5738 from matklad/cfg
Rename ra_cfg -> cfg
Diffstat (limited to 'crates/ra_project_model')
-rw-r--r--crates/ra_project_model/Cargo.toml2
-rw-r--r--crates/ra_project_model/src/cfg_flag.rs2
-rw-r--r--crates/ra_project_model/src/lib.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml
index 171fe8626..52f2d57b3 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/ra_project_model/Cargo.toml
@@ -15,7 +15,7 @@ rustc-hash = "1.1.0"
15cargo_metadata = "0.11.1" 15cargo_metadata = "0.11.1"
16 16
17arena = { path = "../arena" } 17arena = { path = "../arena" }
18ra_cfg = { path = "../ra_cfg" } 18cfg = { path = "../cfg" }
19ra_db = { path = "../ra_db" } 19ra_db = { path = "../ra_db" }
20toolchain = { path = "../toolchain" } 20toolchain = { path = "../toolchain" }
21ra_proc_macro = { path = "../ra_proc_macro" } 21ra_proc_macro = { path = "../ra_proc_macro" }
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"'
4use std::str::FromStr; 4use std::str::FromStr;
5 5
6use ra_cfg::CfgOptions; 6use cfg::CfgOptions;
7use stdx::split_once; 7use 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
14use anyhow::{bail, Context, Result}; 14use anyhow::{bail, Context, Result};
15use cfg::CfgOptions;
15use paths::{AbsPath, AbsPathBuf}; 16use paths::{AbsPath, AbsPathBuf};
16use ra_cfg::CfgOptions;
17use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; 17use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId};
18use rustc_hash::{FxHashMap, FxHashSet}; 18use rustc_hash::{FxHashMap, FxHashSet};
19 19