rename BaseQueryContext to just QueryContext

And use it like `salsa::QueryContext` elsewhere.
This commit is contained in:
Niko Matsakis 2018-09-29 05:34:29 -04:00
parent 288fe5b25f
commit 2e40e9d1e5
9 changed files with 21 additions and 22 deletions

View file

@ -1,4 +1,4 @@
pub trait CompilerQueryContext: salsa::BaseQueryContext {
pub trait CompilerQueryContext: salsa::QueryContext {
fn interner(&self) -> &Interner;
}

View file

@ -1,7 +1,6 @@
use crate::class_table;
use crate::compiler::{CompilerQueryContext, Interner};
use salsa::query_context_storage;
use salsa::BaseQueryContext;
#[derive(Default)]
pub struct QueryContextImpl {
@ -37,7 +36,7 @@ impl CompilerQueryContext for QueryContextImpl {
// Seems like a classic case where specialization could be useful to
// permit behavior refinement.
impl BaseQueryContext for QueryContextImpl {
impl salsa::QueryContext for QueryContextImpl {
type QueryDescriptor = salsa::dyn_descriptor::DynDescriptor;
fn salsa_runtime(&self) -> &salsa::runtime::Runtime<QueryContextImpl> {

View file

@ -25,7 +25,7 @@ impl queries::CounterContext for QueryContextImpl {
}
}
impl salsa::BaseQueryContext for QueryContextImpl {
impl salsa::QueryContext for QueryContextImpl {
type QueryDescriptor = salsa::dyn_descriptor::DynDescriptor;
fn salsa_runtime(&self) -> &salsa::runtime::Runtime<QueryContextImpl> {

View file

@ -1,4 +1,4 @@
crate trait CounterContext: salsa::BaseQueryContext {
crate trait CounterContext: salsa::QueryContext {
fn increment(&self) -> usize;
}