From ed20a857f485a471369cd99b843af19a4d875ad0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:25:38 +0200 Subject: Rename ra_db -> base_db --- crates/project_model/Cargo.toml | 2 +- crates/project_model/src/cargo_workspace.rs | 2 +- crates/project_model/src/lib.rs | 2 +- crates/project_model/src/project_json.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/project_model') 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" arena = { path = "../arena" } cfg = { path = "../cfg" } -ra_db = { path = "../ra_db" } +base_db = { path = "../base_db" } toolchain = { path = "../toolchain" } proc_macro_api = { path = "../proc_macro_api" } 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::{ use anyhow::{Context, Result}; use arena::{Arena, Idx}; +use base_db::Edition; use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; use paths::{AbsPath, AbsPathBuf}; -use ra_db::Edition; use rustc_hash::FxHashMap; 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::{ }; use anyhow::{bail, Context, Result}; +use base_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; use cfg::CfgOptions; use paths::{AbsPath, AbsPathBuf}; -use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; use rustc_hash::{FxHashMap, FxHashSet}; 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 @@ use std::path::PathBuf; +use base_db::{CrateId, CrateName, Dependency, Edition}; use paths::{AbsPath, AbsPathBuf}; -use ra_db::{CrateId, CrateName, Dependency, Edition}; use rustc_hash::FxHashMap; use serde::{de, Deserialize}; -- cgit v1.2.3