mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-08-04 11:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

allow user to define link to storage/runtime entirely

Browse source 
This seems like a more consistent abstraction.
This commit is contained in:
Niko Matsakis 2018-09-29 05:52:14 -04:00
parent 4b4ab53cdb
commit d6821d1097
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/hello_world/implementation.rs
View file

@ -12,7 +12,7 @@ pub struct QueryContextImpl {
// This is an example of how you "link up" all the queries in your
// application.
query_context_storage! {
struct QueryContextImplStorage for storage in QueryContextImpl {
pub struct QueryContextImplStorage for QueryContextImpl {
impl class_table::ClassTableQueryContext {
fn all_classes() for class_table::AllClasses;
fn all_fields() for class_table::AllFields;
@ -37,6 +37,10 @@ impl CompilerQueryContext for QueryContextImpl {
// permit behavior refinement.
impl salsa::QueryContext for QueryContextImpl {
fn salsa_storage(&self) -> &QueryContextImplStorage {
&self.storage
}
fn salsa_runtime(&self) -> &salsa::runtime::Runtime<QueryContextImpl> {
&self.runtime
}

6
examples/storage_varieties/implementation.rs
View file

@ -9,7 +9,7 @@ pub struct QueryContextImpl {
}
salsa::query_context_storage! {
struct QueryContextImplStorage for storage in QueryContextImpl {
pub struct QueryContextImplStorage for QueryContextImpl {
impl queries::QueryContext {
fn memoized() for queries::Memoized;
fn transparent() for queries::Transparent;
@ -26,6 +26,10 @@ impl queries::CounterContext for QueryContextImpl {
}
impl salsa::QueryContext for QueryContextImpl {
fn salsa_storage(&self) -> &QueryContextImplStorage {
&self.storage
}
fn salsa_runtime(&self) -> &salsa::runtime::Runtime<QueryContextImpl> {
&self.runtime
}

19
src/lib.rs
View file

@ -29,16 +29,19 @@ pub use self::runtime::Runtime;
/// The base trait which your "query context" must implement. Gives
/// access to the salsa runtime, which you must embed into your query
/// context (along with whatever other state you may require).
pub trait QueryContext: Sized + HasQueryContextDescriptor {
pub trait QueryContext: Sized + QueryContextStorageTypes {
/// Gives access to the underlying salsa runtime.
fn salsa_runtime(&self) -> &runtime::Runtime<Self>;
/// Gives access to the underlying query storage.
fn salsa_storage(&self) -> &Self::QueryStorage;
}
/// Defines the `QueryDescriptor` associated type. An impl of this
/// should be generated for your query-context type automatically by
/// the `query_context_storage` macro, so you shouldn't need to mess
/// with this trait directly.
pub trait HasQueryContextDescriptor {
pub trait QueryContextStorageTypes {
/// A "query descriptor" packages up all the possible queries and a key.
/// It is used to store information about (e.g.) the stack.
///
@ -46,6 +49,10 @@ pub trait HasQueryContextDescriptor {
/// works for a fixed set of queries, but a boxed trait object is good
/// for a more open-ended option.
type QueryDescriptor: Debug + Eq;
/// Defines the "storage type", where all the query data is kept.
/// This type is defined by the `query_context_storage` macro.
type QueryStorage;
}
pub trait Query<QC: QueryContext>: Debug + Default + Sized + 'static {
@ -314,7 +321,7 @@ macro_rules! query_definition {
macro_rules! query_context_storage {
(
$(#[$attr:meta])*
$v:vis struct $Storage:ident for $storage_field:ident in $QueryContext:ty {
$v:vis struct $Storage:ident for $QueryContext:ty {
$(
impl $TraitName:path {
$(
@ -335,8 +342,9 @@ macro_rules! query_context_storage {
)*
}
impl $crate::HasQueryContextDescriptor for $QueryContext {
impl $crate::QueryContextStorageTypes for $QueryContext {
type QueryDescriptor = $crate::dyn_descriptor::DynDescriptor;
type QueryStorage = $Storage;
}
$(
@ -347,8 +355,7 @@ macro_rules! query_context_storage {
) -> $crate::QueryTable<'_, Self, $QueryType> {
$crate::QueryTable::new(
self,
&self.$storage_field.$query_method,
&$crate::QueryContext::salsa_storage(self).$query_method,
$crate::dyn_descriptor::DynDescriptor::from_key::<
Self,
$QueryType,