diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-15 18:55:03 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-15 18:55:03 +0100 |
commit | e929355eca10b1d8d4e55ddd41549d5bf0a685aa (patch) | |
tree | 872ab3701dcd27207fab5531269a66d205c74539 /crates/ra_analysis/src/db/mod.rs | |
parent | a230b438e025c5878b8d17e11d3928cbad95bb28 (diff) | |
parent | 9a98d8e99acf8acd40b2153847a37551d2a8d0f4 (diff) |
Merge #129
129: 2018 r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/db/mod.rs')
-rw-r--r-- | crates/ra_analysis/src/db/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_analysis/src/db/mod.rs b/crates/ra_analysis/src/db/mod.rs index 22769d112..4eb7d922d 100644 --- a/crates/ra_analysis/src/db/mod.rs +++ b/crates/ra_analysis/src/db/mod.rs | |||
@@ -5,7 +5,7 @@ use std::{ | |||
5 | }; | 5 | }; |
6 | use im; | 6 | use im; |
7 | use salsa; | 7 | use salsa; |
8 | use {FileId, imp::FileResolverImp}; | 8 | use crate::{FileId, imp::FileResolverImp}; |
9 | 9 | ||
10 | #[derive(Debug, Default, Clone)] | 10 | #[derive(Debug, Default, Clone)] |
11 | pub(crate) struct State { | 11 | pub(crate) struct State { |
@@ -75,8 +75,8 @@ pub(crate) fn file_set(ctx: QueryCtx) -> Arc<(Vec<FileId>, FileResolverImp)> { | |||
75 | impl QueryRegistry { | 75 | impl QueryRegistry { |
76 | fn new() -> QueryRegistry { | 76 | fn new() -> QueryRegistry { |
77 | let mut reg = QueryRegistry { imp: imp::QueryRegistry::new() }; | 77 | let mut reg = QueryRegistry { imp: imp::QueryRegistry::new() }; |
78 | ::queries::register_queries(&mut reg); | 78 | crate::queries::register_queries(&mut reg); |
79 | ::module_map::register_queries(&mut reg); | 79 | crate::module_map::register_queries(&mut reg); |
80 | reg | 80 | reg |
81 | } | 81 | } |
82 | pub(crate) fn add<Q: imp::EvalQuery>(&mut self, q: Q, name: &'static str) { | 82 | pub(crate) fn add<Q: imp::EvalQuery>(&mut self, q: Q, name: &'static str) { |