diff options
author | Aleksey Kladov <[email protected]> | 2018-12-19 09:20:54 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-12-20 09:15:38 +0000 |
commit | 85290bc1342560d5560f0b2151cff1c0c6dac155 (patch) | |
tree | e7817987dc9dba9485659b8c2585e3c6315496c9 /crates/ra_db/src/input.rs | |
parent | 815a0e577821a3876aa4c79c13200607acadcd2f (diff) |
switch analysis to vfs
Diffstat (limited to 'crates/ra_db/src/input.rs')
-rw-r--r-- | crates/ra_db/src/input.rs | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs index 65b674da9..51daa8e86 100644 --- a/crates/ra_db/src/input.rs +++ b/crates/ra_db/src/input.rs | |||
@@ -1,10 +1,15 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | 2 | ||
3 | use rustc_hash::{FxHashSet, FxHashMap}; | 3 | use rustc_hash::{FxHashMap}; |
4 | use relative_path::RelativePathBuf; | 4 | use relative_path::RelativePathBuf; |
5 | use ra_syntax::SmolStr; | 5 | use ra_syntax::SmolStr; |
6 | use salsa; | 6 | use salsa; |
7 | 7 | ||
8 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] | ||
9 | pub struct SourceRootId(pub u32); | ||
10 | |||
11 | pub const WORKSPACE: SourceRootId = SourceRootId(0); | ||
12 | |||
8 | #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] | 13 | #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] |
9 | pub struct FileId(pub u32); | 14 | pub struct FileId(pub u32); |
10 | 15 | ||
@@ -93,14 +98,6 @@ salsa::query_group! { | |||
93 | type FileSourceRootQuery; | 98 | type FileSourceRootQuery; |
94 | storage input; | 99 | storage input; |
95 | } | 100 | } |
96 | fn source_root_files(id: SourceRootId) -> Arc<FxHashSet<FileId>> { | ||
97 | type SourceRootFilesQuery; | ||
98 | storage input; | ||
99 | } | ||
100 | fn source_root_file_by_path(id: SourceRootId, path: RelativePathBuf) -> Option<FileId> { | ||
101 | type SourceRootFileByPathQuery; | ||
102 | storage input; | ||
103 | } | ||
104 | fn source_root(id: SourceRootId) -> Arc<SourceRoot> { | 101 | fn source_root(id: SourceRootId) -> Arc<SourceRoot> { |
105 | type SourceRootQuery; | 102 | type SourceRootQuery; |
106 | storage input; | 103 | storage input; |
@@ -116,12 +113,7 @@ salsa::query_group! { | |||
116 | } | 113 | } |
117 | } | 114 | } |
118 | 115 | ||
119 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] | ||
120 | pub struct SourceRootId(pub u32); | ||
121 | |||
122 | #[derive(Default, Clone, Debug, PartialEq, Eq)] | 116 | #[derive(Default, Clone, Debug, PartialEq, Eq)] |
123 | pub struct SourceRoot { | 117 | pub struct SourceRoot { |
124 | pub files: FxHashSet<FileId>, | 118 | pub files: FxHashMap<RelativePathBuf, FileId>, |
125 | } | 119 | } |
126 | |||
127 | pub const WORKSPACE: SourceRootId = SourceRootId(0); | ||