aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-11-27 14:39:58 +0000
committerAleksey Kladov <[email protected]>2018-11-27 14:39:58 +0000
commit6bb06addf8d5100cd1125c40d3dfa5f7613b42c1 (patch)
tree164746e9380ce63ddef5a6b811c99611fdbf5e10 /crates
parent0bc6f5802f3b80b76aeeb1668a1e1f5db7494309 (diff)
don't use volatile queries
"volatile" means "changes every time". That is, all transitive rev-deps of volatile queries will be executed every time. We actually need "dependencies".
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_analysis/src/db.rs2
-rw-r--r--crates/ra_analysis/src/descriptors/mod.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs
index 418711300..4e34265fb 100644
--- a/crates/ra_analysis/src/db.rs
+++ b/crates/ra_analysis/src/db.rs
@@ -149,7 +149,7 @@ salsa::query_group! {
149 fn resolve_syntax_ptr(ptr: SyntaxPtr) -> SyntaxNode { 149 fn resolve_syntax_ptr(ptr: SyntaxPtr) -> SyntaxNode {
150 type ResolveSyntaxPtrQuery; 150 type ResolveSyntaxPtrQuery;
151 // Don't retain syntax trees in memory 151 // Don't retain syntax trees in memory
152 storage volatile; 152 storage dependencies;
153 use fn crate::syntax_ptr::resolve_syntax_ptr; 153 use fn crate::syntax_ptr::resolve_syntax_ptr;
154 } 154 }
155 } 155 }
diff --git a/crates/ra_analysis/src/descriptors/mod.rs b/crates/ra_analysis/src/descriptors/mod.rs
index a5e956024..98094d9ee 100644
--- a/crates/ra_analysis/src/descriptors/mod.rs
+++ b/crates/ra_analysis/src/descriptors/mod.rs
@@ -32,13 +32,13 @@ salsa::query_group! {
32 32
33 fn _file_items(file_id: FileId) -> Arc<FileItems> { 33 fn _file_items(file_id: FileId) -> Arc<FileItems> {
34 type FileItemsQuery; 34 type FileItemsQuery;
35 storage volatile; 35 storage dependencies;
36 use fn module::nameres::file_items; 36 use fn module::nameres::file_items;
37 } 37 }
38 38
39 fn _file_item(file_id: FileId, file_item_id: FileItemId) -> SyntaxNode { 39 fn _file_item(file_id: FileId, file_item_id: FileItemId) -> SyntaxNode {
40 type FileItemQuery; 40 type FileItemQuery;
41 storage volatile; 41 storage dependencies;
42 use fn module::nameres::file_item; 42 use fn module::nameres::file_item;
43 } 43 }
44 44
@@ -57,7 +57,7 @@ salsa::query_group! {
57 fn _fn_syntax(fn_id: FnId) -> FnDefNode { 57 fn _fn_syntax(fn_id: FnId) -> FnDefNode {
58 type FnSyntaxQuery; 58 type FnSyntaxQuery;
59 // Don't retain syntax trees in memory 59 // Don't retain syntax trees in memory
60 storage volatile; 60 storage dependencies;
61 use fn function::imp::fn_syntax; 61 use fn function::imp::fn_syntax;
62 } 62 }
63 fn _submodules(source: ModuleSource) -> Cancelable<Arc<Vec<module::imp::Submodule>>> { 63 fn _submodules(source: ModuleSource) -> Cancelable<Arc<Vec<module::imp::Submodule>>> {