From 11168c464cd962af3336a2cc68295496066edd6c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 28 Nov 2018 03:25:20 +0300 Subject: move db basics to ra_db This should allow to move hir to a separate crate --- crates/ra_analysis/src/hir/module/imp.rs | 4 ++-- crates/ra_analysis/src/hir/module/mod.rs | 2 +- crates/ra_analysis/src/hir/module/nameres.rs | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'crates/ra_analysis/src/hir/module') diff --git a/crates/ra_analysis/src/hir/module/imp.rs b/crates/ra_analysis/src/hir/module/imp.rs index d51ca2d59..c8f7ed58d 100644 --- a/crates/ra_analysis/src/hir/module/imp.rs +++ b/crates/ra_analysis/src/hir/module/imp.rs @@ -6,11 +6,11 @@ use ra_syntax::{ }; use relative_path::RelativePathBuf; use rustc_hash::{FxHashMap, FxHashSet}; +use ra_db::{SourceRoot, SourceRootId, FileResolverImp}; use crate::{ hir::HirDatabase, - input::{SourceRoot, SourceRootId}, - Cancelable, FileId, FileResolverImp, + Cancelable, FileId, }; use super::{ diff --git a/crates/ra_analysis/src/hir/module/mod.rs b/crates/ra_analysis/src/hir/module/mod.rs index 893ec3a10..683cb5d4c 100644 --- a/crates/ra_analysis/src/hir/module/mod.rs +++ b/crates/ra_analysis/src/hir/module/mod.rs @@ -10,12 +10,12 @@ use ra_syntax::{ ast::{self, AstNode, NameOwner}, SmolStr, SyntaxNode, }; +use ra_db::SourceRootId; use relative_path::RelativePathBuf; use crate::{ FileId, FilePosition, Cancelable, hir::{Path, PathKind, HirDatabase, SourceItemId}, - input::SourceRootId, arena::{Arena, Id}, loc2id::{DefLoc, DefId}, }; diff --git a/crates/ra_analysis/src/hir/module/nameres.rs b/crates/ra_analysis/src/hir/module/nameres.rs index f48f51c8d..5c87e7af2 100644 --- a/crates/ra_analysis/src/hir/module/nameres.rs +++ b/crates/ra_analysis/src/hir/module/nameres.rs @@ -19,12 +19,12 @@ use std::{ }; use rustc_hash::FxHashMap; - use ra_syntax::{ TextRange, SmolStr, SyntaxKind::{self, *}, ast::{self, AstNode} }; +use ra_db::SourceRootId; use crate::{ Cancelable, FileId, @@ -35,7 +35,6 @@ use crate::{ HirDatabase, module::{ModuleId, ModuleTree}, }, - input::SourceRootId, }; /// Item map is the result of the name resolution. Item map contains, for each @@ -342,11 +341,11 @@ where #[cfg(test)] mod tests { + use ra_db::FilesDatabase; use crate::{ AnalysisChange, mock_analysis::{MockAnalysis, analysis_and_position}, hir::{self, HirDatabase}, - input::FilesDatabase, }; use super::*; -- cgit v1.2.3