diff options
Diffstat (limited to 'crates/project_model')
-rw-r--r-- | crates/project_model/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/project_model/src/cargo_workspace.rs | 2 | ||||
-rw-r--r-- | crates/project_model/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/project_model/src/project_json.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crates/project_model/Cargo.toml b/crates/project_model/Cargo.toml index 1c84c7d20..386f72f41 100644 --- a/crates/project_model/Cargo.toml +++ b/crates/project_model/Cargo.toml | |||
@@ -18,7 +18,7 @@ anyhow = "1.0.26" | |||
18 | 18 | ||
19 | arena = { path = "../arena" } | 19 | arena = { path = "../arena" } |
20 | cfg = { path = "../cfg" } | 20 | cfg = { path = "../cfg" } |
21 | ra_db = { path = "../ra_db" } | 21 | base_db = { path = "../base_db" } |
22 | toolchain = { path = "../toolchain" } | 22 | toolchain = { path = "../toolchain" } |
23 | proc_macro_api = { path = "../proc_macro_api" } | 23 | proc_macro_api = { path = "../proc_macro_api" } |
24 | paths = { path = "../paths" } | 24 | paths = { path = "../paths" } |
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs index abf8dca96..e5c2d2b25 100644 --- a/crates/project_model/src/cargo_workspace.rs +++ b/crates/project_model/src/cargo_workspace.rs | |||
@@ -9,9 +9,9 @@ use std::{ | |||
9 | 9 | ||
10 | use anyhow::{Context, Result}; | 10 | use anyhow::{Context, Result}; |
11 | use arena::{Arena, Idx}; | 11 | use arena::{Arena, Idx}; |
12 | use base_db::Edition; | ||
12 | use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; | 13 | use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; |
13 | use paths::{AbsPath, AbsPathBuf}; | 14 | use paths::{AbsPath, AbsPathBuf}; |
14 | use ra_db::Edition; | ||
15 | use rustc_hash::FxHashMap; | 15 | use rustc_hash::FxHashMap; |
16 | 16 | ||
17 | use crate::cfg_flag::CfgFlag; | 17 | use crate::cfg_flag::CfgFlag; |
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs index 234f908c9..1f5a94d7f 100644 --- a/crates/project_model/src/lib.rs +++ b/crates/project_model/src/lib.rs | |||
@@ -12,9 +12,9 @@ use std::{ | |||
12 | }; | 12 | }; |
13 | 13 | ||
14 | use anyhow::{bail, Context, Result}; | 14 | use anyhow::{bail, Context, Result}; |
15 | use base_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; | ||
15 | use cfg::CfgOptions; | 16 | use cfg::CfgOptions; |
16 | use paths::{AbsPath, AbsPathBuf}; | 17 | use paths::{AbsPath, AbsPathBuf}; |
17 | use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; | ||
18 | use rustc_hash::{FxHashMap, FxHashSet}; | 18 | use rustc_hash::{FxHashMap, FxHashSet}; |
19 | 19 | ||
20 | use crate::cfg_flag::CfgFlag; | 20 | use crate::cfg_flag::CfgFlag; |
diff --git a/crates/project_model/src/project_json.rs b/crates/project_model/src/project_json.rs index e3f3163f6..060ea5b7d 100644 --- a/crates/project_model/src/project_json.rs +++ b/crates/project_model/src/project_json.rs | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | use std::path::PathBuf; | 3 | use std::path::PathBuf; |
4 | 4 | ||
5 | use base_db::{CrateId, CrateName, Dependency, Edition}; | ||
5 | use paths::{AbsPath, AbsPathBuf}; | 6 | use paths::{AbsPath, AbsPathBuf}; |
6 | use ra_db::{CrateId, CrateName, Dependency, Edition}; | ||
7 | use rustc_hash::FxHashMap; | 7 | use rustc_hash::FxHashMap; |
8 | use serde::{de, Deserialize}; | 8 | use serde::{de, Deserialize}; |
9 | 9 | ||