aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-10-31 18:16:58 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-10-31 18:16:58 +0000
commitb58ca6b1a68471f6944893b94f09cd56dc28f837 (patch)
tree302ffa52dfee5d44dc82cfd7241cef82fbef8ad4 /crates
parent1dc5608d0bb6bf2eee5a1b9190fcb2f8cdfa2ef3 (diff)
parent542fbcbaed489d4f68ede5e3a9ab036c0f585156 (diff)
Merge #177
177: Librariese -> Libraries r=matklad a=kjeremy Co-authored-by: Jeremy A. Kolb <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_analysis/src/db.rs2
-rw-r--r--crates/ra_analysis/src/imp.rs2
-rw-r--r--crates/ra_analysis/src/input.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs
index fe6587f20..f1ace3d5a 100644
--- a/crates/ra_analysis/src/db.rs
+++ b/crates/ra_analysis/src/db.rs
@@ -57,7 +57,7 @@ salsa::database_storage! {
57 fn file_text() for crate::input::FileTextQuery; 57 fn file_text() for crate::input::FileTextQuery;
58 fn file_source_root() for crate::input::FileSourceRootQuery; 58 fn file_source_root() for crate::input::FileSourceRootQuery;
59 fn source_root() for crate::input::SourceRootQuery; 59 fn source_root() for crate::input::SourceRootQuery;
60 fn libraries() for crate::input::LibrarieseQuery; 60 fn libraries() for crate::input::LibrariesQuery;
61 fn library_symbols() for crate::input::LibrarySymbolsQuery; 61 fn library_symbols() for crate::input::LibrarySymbolsQuery;
62 fn crate_graph() for crate::input::CrateGraphQuery; 62 fn crate_graph() for crate::input::CrateGraphQuery;
63 } 63 }
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 38d4b6a23..ab795a647 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -168,7 +168,7 @@ impl AnalysisHostImpl {
168 .set(source_root_id, Arc::new(library.symbol_index)); 168 .set(source_root_id, Arc::new(library.symbol_index));
169 } 169 }
170 self.db 170 self.db
171 .query(crate::input::LibrarieseQuery) 171 .query(crate::input::LibrariesQuery)
172 .set((), Arc::new(libraries)); 172 .set((), Arc::new(libraries));
173 } 173 }
174 if let Some(crate_graph) = change.crate_graph { 174 if let Some(crate_graph) = change.crate_graph {
diff --git a/crates/ra_analysis/src/input.rs b/crates/ra_analysis/src/input.rs
index 98781751a..fd63182c7 100644
--- a/crates/ra_analysis/src/input.rs
+++ b/crates/ra_analysis/src/input.rs
@@ -53,7 +53,7 @@ salsa::query_group! {
53 storage input; 53 storage input;
54 } 54 }
55 fn libraries() -> Arc<Vec<SourceRootId>> { 55 fn libraries() -> Arc<Vec<SourceRootId>> {
56 type LibrarieseQuery; 56 type LibrariesQuery;
57 storage input; 57 storage input;
58 } 58 }
59 fn library_symbols(id: SourceRootId) -> Arc<SymbolIndex> { 59 fn library_symbols(id: SourceRootId) -> Arc<SymbolIndex> {