Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #177

Browse source 
177: Librariese -> Libraries r=matklad a=kjeremy



Co-authored-by: Jeremy A. Kolb <jkolb@ara.com>
This commit is contained in:
bors[bot] 2018-10-31 18:16:58 +00:00
commit b58ca6b1a6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_analysis/src/db.rs
View file

@ -57,7 +57,7 @@ salsa::database_storage! {
fn file_text() for crate::input::FileTextQuery; fn file_text() for crate::input::FileTextQuery;
fn file_source_root() for crate::input::FileSourceRootQuery; fn file_source_root() for crate::input::FileSourceRootQuery;
fn source_root() for crate::input::SourceRootQuery; fn source_root() for crate::input::SourceRootQuery;
fn libraries() for crate::input::LibrarieseQuery; fn libraries() for crate::input::LibrariesQuery;
fn library_symbols() for crate::input::LibrarySymbolsQuery; fn library_symbols() for crate::input::LibrarySymbolsQuery;
fn crate_graph() for crate::input::CrateGraphQuery; fn crate_graph() for crate::input::CrateGraphQuery;
} }

2
crates/ra_analysis/src/imp.rs
View file

@ -168,7 +168,7 @@ impl AnalysisHostImpl {
.set(source_root_id, Arc::new(library.symbol_index)); .set(source_root_id, Arc::new(library.symbol_index));
} }
self.db self.db
.query(crate::input::LibrarieseQuery) .query(crate::input::LibrariesQuery)
.set((), Arc::new(libraries)); .set((), Arc::new(libraries));
} }
if let Some(crate_graph) = change.crate_graph { if let Some(crate_graph) = change.crate_graph {

2
crates/ra_analysis/src/input.rs
View file

@ -53,7 +53,7 @@ salsa::query_group! {
storage input; storage input;
} }
fn libraries() -> Arc<Vec<SourceRootId>> { fn libraries() -> Arc<Vec<SourceRootId>> {
type LibrarieseQuery; type LibrariesQuery;
storage input; storage input;
} }
fn library_symbols(id: SourceRootId) -> Arc<SymbolIndex> { fn library_symbols(id: SourceRootId) -> Arc<SymbolIndex> {