diff options
author | Aleksey Kladov <[email protected]> | 2018-11-28 00:25:20 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-11-28 00:25:20 +0000 |
commit | 11168c464cd962af3336a2cc68295496066edd6c (patch) | |
tree | 2c3b0bceea0dcf092ae8bf9d16c1508295606b09 /crates/ra_analysis/src/hir/module | |
parent | b2de95879a8d48cc4077895376b0aaed1e972169 (diff) |
move db basics to ra_db
This should allow to move hir to a separate crate
Diffstat (limited to 'crates/ra_analysis/src/hir/module')
-rw-r--r-- | crates/ra_analysis/src/hir/module/imp.rs | 4 | ||||
-rw-r--r-- | crates/ra_analysis/src/hir/module/mod.rs | 2 | ||||
-rw-r--r-- | crates/ra_analysis/src/hir/module/nameres.rs | 5 |
3 files changed, 5 insertions, 6 deletions
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::{ | |||
6 | }; | 6 | }; |
7 | use relative_path::RelativePathBuf; | 7 | use relative_path::RelativePathBuf; |
8 | use rustc_hash::{FxHashMap, FxHashSet}; | 8 | use rustc_hash::{FxHashMap, FxHashSet}; |
9 | use ra_db::{SourceRoot, SourceRootId, FileResolverImp}; | ||
9 | 10 | ||
10 | use crate::{ | 11 | use crate::{ |
11 | hir::HirDatabase, | 12 | hir::HirDatabase, |
12 | input::{SourceRoot, SourceRootId}, | 13 | Cancelable, FileId, |
13 | Cancelable, FileId, FileResolverImp, | ||
14 | }; | 14 | }; |
15 | 15 | ||
16 | use super::{ | 16 | 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::{ | |||
10 | ast::{self, AstNode, NameOwner}, | 10 | ast::{self, AstNode, NameOwner}, |
11 | SmolStr, SyntaxNode, | 11 | SmolStr, SyntaxNode, |
12 | }; | 12 | }; |
13 | use ra_db::SourceRootId; | ||
13 | use relative_path::RelativePathBuf; | 14 | use relative_path::RelativePathBuf; |
14 | 15 | ||
15 | use crate::{ | 16 | use crate::{ |
16 | FileId, FilePosition, Cancelable, | 17 | FileId, FilePosition, Cancelable, |
17 | hir::{Path, PathKind, HirDatabase, SourceItemId}, | 18 | hir::{Path, PathKind, HirDatabase, SourceItemId}, |
18 | input::SourceRootId, | ||
19 | arena::{Arena, Id}, | 19 | arena::{Arena, Id}, |
20 | loc2id::{DefLoc, DefId}, | 20 | loc2id::{DefLoc, DefId}, |
21 | }; | 21 | }; |
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::{ | |||
19 | }; | 19 | }; |
20 | 20 | ||
21 | use rustc_hash::FxHashMap; | 21 | use rustc_hash::FxHashMap; |
22 | |||
23 | use ra_syntax::{ | 22 | use ra_syntax::{ |
24 | TextRange, | 23 | TextRange, |
25 | SmolStr, SyntaxKind::{self, *}, | 24 | SmolStr, SyntaxKind::{self, *}, |
26 | ast::{self, AstNode} | 25 | ast::{self, AstNode} |
27 | }; | 26 | }; |
27 | use ra_db::SourceRootId; | ||
28 | 28 | ||
29 | use crate::{ | 29 | use crate::{ |
30 | Cancelable, FileId, | 30 | Cancelable, FileId, |
@@ -35,7 +35,6 @@ use crate::{ | |||
35 | HirDatabase, | 35 | HirDatabase, |
36 | module::{ModuleId, ModuleTree}, | 36 | module::{ModuleId, ModuleTree}, |
37 | }, | 37 | }, |
38 | input::SourceRootId, | ||
39 | }; | 38 | }; |
40 | 39 | ||
41 | /// Item map is the result of the name resolution. Item map contains, for each | 40 | /// Item map is the result of the name resolution. Item map contains, for each |
@@ -342,11 +341,11 @@ where | |||
342 | 341 | ||
343 | #[cfg(test)] | 342 | #[cfg(test)] |
344 | mod tests { | 343 | mod tests { |
344 | use ra_db::FilesDatabase; | ||
345 | use crate::{ | 345 | use crate::{ |
346 | AnalysisChange, | 346 | AnalysisChange, |
347 | mock_analysis::{MockAnalysis, analysis_and_position}, | 347 | mock_analysis::{MockAnalysis, analysis_and_position}, |
348 | hir::{self, HirDatabase}, | 348 | hir::{self, HirDatabase}, |
349 | input::FilesDatabase, | ||
350 | }; | 349 | }; |
351 | use super::*; | 350 | use super::*; |
352 | 351 | ||