From ed20a857f485a471369cd99b843af19a4d875ad0 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 13 Aug 2020 16:25:38 +0200
Subject: Rename ra_db -> base_db

---
 crates/ra_hir_def/src/nameres/collector.rs         | 4 ++--
 crates/ra_hir_def/src/nameres/mod_resolution.rs    | 2 +-
 crates/ra_hir_def/src/nameres/path_resolution.rs   | 2 +-
 crates/ra_hir_def/src/nameres/tests.rs             | 2 +-
 crates/ra_hir_def/src/nameres/tests/incremental.rs | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'crates/ra_hir_def/src/nameres')

diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 6a5891936..3e99c8773 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -3,6 +3,7 @@
 //! `DefCollector::collect` contains the fixed-point iteration loop which
 //! resolves imports and expands macros.
 
+use base_db::{CrateId, FileId, ProcMacroId};
 use cfg::CfgOptions;
 use hir_expand::{
     ast_id_map::FileAstId,
@@ -12,7 +13,6 @@ use hir_expand::{
     proc_macro::ProcMacroExpander,
     HirFileId, MacroCallId, MacroDefId, MacroDefKind,
 };
-use ra_db::{CrateId, FileId, ProcMacroId};
 use rustc_hash::FxHashMap;
 use syntax::ast;
 use test_utils::mark;
@@ -1209,7 +1209,7 @@ fn is_macro_rules(path: &ModPath) -> bool {
 mod tests {
     use crate::{db::DefDatabase, test_db::TestDB};
     use arena::Arena;
-    use ra_db::{fixture::WithFixture, SourceDatabase};
+    use base_db::{fixture::WithFixture, SourceDatabase};
 
     use super::*;
 
diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs
index 316245d6b..e8389b484 100644
--- a/crates/ra_hir_def/src/nameres/mod_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs
@@ -1,6 +1,6 @@
 //! This module resolves `mod foo;` declaration to file.
+use base_db::FileId;
 use hir_expand::name::Name;
-use ra_db::FileId;
 use syntax::SmolStr;
 
 use crate::{db::DefDatabase, HirFileId};
diff --git a/crates/ra_hir_def/src/nameres/path_resolution.rs b/crates/ra_hir_def/src/nameres/path_resolution.rs
index dbfa7fccb..88e10574e 100644
--- a/crates/ra_hir_def/src/nameres/path_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/path_resolution.rs
@@ -12,8 +12,8 @@
 
 use std::iter::successors;
 
+use base_db::Edition;
 use hir_expand::name::Name;
-use ra_db::Edition;
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs
index 839b1de57..b105d56b2 100644
--- a/crates/ra_hir_def/src/nameres/tests.rs
+++ b/crates/ra_hir_def/src/nameres/tests.rs
@@ -6,8 +6,8 @@ mod primitives;
 
 use std::sync::Arc;
 
+use base_db::{fixture::WithFixture, SourceDatabase};
 use expect::{expect, Expect};
-use ra_db::{fixture::WithFixture, SourceDatabase};
 use test_utils::mark;
 
 use crate::{db::DefDatabase, nameres::*, test_db::TestDB};
diff --git a/crates/ra_hir_def/src/nameres/tests/incremental.rs b/crates/ra_hir_def/src/nameres/tests/incremental.rs
index 0c288a108..cfbc62cc4 100644
--- a/crates/ra_hir_def/src/nameres/tests/incremental.rs
+++ b/crates/ra_hir_def/src/nameres/tests/incremental.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use ra_db::SourceDatabaseExt;
+use base_db::SourceDatabaseExt;
 
 use super::*;
 
-- 
cgit v1.2.3