rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

migrate analysis and server to 2018

Browse Source
This commit is contained in:
Aleksey Kladov
2018-10-15 20:15:53 +03:00
parent 2dd6858d03
commit bb298158eb
21 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_analysis/src/db/imp.rs
View File

@@ -7,7 +7,7 @@ use std::{
};
use rustc_hash::FxHashMap;
use salsa;
use {FileId, imp::FileResolverImp};
use crate::{FileId, imp::FileResolverImp};
use super::{State, Query, QueryCtx};
pub(super) type Data = Arc<Any + Send + Sync + 'static>;
@@ -51,7 +51,7 @@ pub(crate) trait EvalQuery {
type Output;
fn query_type(&self) -> salsa::QueryTypeId;
fn f(&self) -> salsa::QueryFn<State, Data>;
fn get(&self, &QueryCtx, Self::Params) -> Arc<Self::Output>;
fn get(&self, ctx: &QueryCtx, params: Self::Params) -> Arc<Self::Output>;
}
impl<T, R> EvalQuery for Query<T, R>

6
crates/ra_analysis/src/db/mod.rs
View File

@@ -5,7 +5,7 @@ use std::{
};
use im;
use salsa;
use {FileId, imp::FileResolverImp};
use crate::{FileId, imp::FileResolverImp};
#[derive(Debug, Default, Clone)]
pub(crate) struct State {
@@ -75,8 +75,8 @@ pub(crate) fn file_set(ctx: QueryCtx) -> Arc<(Vec<FileId>, FileResolverImp)> {
impl QueryRegistry {
fn new() -> QueryRegistry {
let mut reg = QueryRegistry { imp: imp::QueryRegistry::new() };
::queries::register_queries(&mut reg);
::module_map::register_queries(&mut reg);
crate::queries::register_queries(&mut reg);
crate::module_map::register_queries(&mut reg);
reg
}
pub(crate) fn add<Q: imp::EvalQuery>(&mut self, q: Q, name: &'static str) {