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/lib.rs | |
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/lib.rs')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index c0e43544e..012d36b8e 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -19,8 +19,6 @@ macro_rules! ctry { | |||
19 | } | 19 | } |
20 | 20 | ||
21 | mod arena; | 21 | mod arena; |
22 | mod syntax_ptr; | ||
23 | mod input; | ||
24 | mod db; | 22 | mod db; |
25 | mod loc2id; | 23 | mod loc2id; |
26 | mod imp; | 24 | mod imp; |
@@ -32,35 +30,27 @@ pub mod mock_analysis; | |||
32 | use std::{fmt, sync::Arc}; | 30 | use std::{fmt, sync::Arc}; |
33 | 31 | ||
34 | use ra_syntax::{AtomEdit, SourceFileNode, TextRange, TextUnit}; | 32 | use ra_syntax::{AtomEdit, SourceFileNode, TextRange, TextUnit}; |
33 | use ra_db::FileResolverImp; | ||
35 | use rayon::prelude::*; | 34 | use rayon::prelude::*; |
36 | use relative_path::RelativePathBuf; | 35 | use relative_path::RelativePathBuf; |
37 | 36 | ||
38 | use crate::{ | 37 | use crate::{ |
39 | imp::{AnalysisHostImpl, AnalysisImpl, FileResolverImp}, | 38 | imp::{AnalysisHostImpl, AnalysisImpl}, |
40 | symbol_index::SymbolIndex, | 39 | symbol_index::SymbolIndex, |
41 | }; | 40 | }; |
42 | 41 | ||
43 | pub use crate::{ | 42 | pub use crate::{ |
44 | completion::CompletionItem, | 43 | completion::CompletionItem, |
45 | hir::FnSignatureInfo, | 44 | hir::FnSignatureInfo, |
46 | input::{CrateGraph, CrateId, FileId, FileResolver}, | ||
47 | }; | 45 | }; |
48 | pub use ra_editor::{ | 46 | pub use ra_editor::{ |
49 | FileSymbol, Fold, FoldKind, HighlightedRange, LineIndex, Runnable, RunnableKind, StructureNode, | 47 | FileSymbol, Fold, FoldKind, HighlightedRange, LineIndex, Runnable, RunnableKind, StructureNode, |
50 | }; | 48 | }; |
51 | 49 | ||
52 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] | 50 | pub use ra_db::{ |
53 | pub struct Canceled; | 51 | Canceled, Cancelable, |
54 | 52 | CrateGraph, CrateId, FileId, FileResolver | |
55 | pub type Cancelable<T> = Result<T, Canceled>; | 53 | }; |
56 | |||
57 | impl std::fmt::Display for Canceled { | ||
58 | fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
59 | fmt.write_str("Canceled") | ||
60 | } | ||
61 | } | ||
62 | |||
63 | impl std::error::Error for Canceled {} | ||
64 | 54 | ||
65 | #[derive(Default)] | 55 | #[derive(Default)] |
66 | pub struct AnalysisChange { | 56 | pub struct AnalysisChange { |