mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-12 08:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement QueryTable constructor manually

Browse source
This commit is contained in:
Laurențiu Nicola 2019-10-03 19:26:20 +03:00
parent afe6b457f3
commit c99580ba14
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -10,7 +10,6 @@ readme = "README.md"
[dependencies] [dependencies]
crossbeam = "0.7.1" crossbeam = "0.7.1"
derive-new = "0.5.5"
indexmap = "1.0.1" indexmap = "1.0.1"
log = "0.4.5" log = "0.4.5"
parking_lot = "0.9.0" parking_lot = "0.9.0"

17
src/lib.rs
View file

@ -30,7 +30,6 @@ use crate::plumbing::LruQueryStorageOps;
use crate::plumbing::QueryStorageMassOps; use crate::plumbing::QueryStorageMassOps;
use crate::plumbing::QueryStorageOps; use crate::plumbing::QueryStorageOps;
use crate::revision::Revision; use crate::revision::Revision;
use derive_new::new;
use std::fmt::{self, Debug}; use std::fmt::{self, Debug};
use std::hash::Hash; use std::hash::Hash;
use std::sync::Arc; use std::sync::Arc;
@ -453,7 +452,6 @@ pub unsafe trait Query<DB: Database>: Debug + Default + Sized + 'static {
/// Gives access to various less common operations on queries. /// Gives access to various less common operations on queries.
/// ///
/// [the `query_mut` method]: trait.Database#method.query /// [the `query_mut` method]: trait.Database#method.query
#[derive(new)]
pub struct QueryTable<'me, DB, Q> pub struct QueryTable<'me, DB, Q>
where where
DB: plumbing::GetQueryTable<Q>, DB: plumbing::GetQueryTable<Q>,
@ -463,11 +461,16 @@ where
storage: &'me Q::Storage, storage: &'me Q::Storage,
} }
impl<DB, Q> QueryTable<'_, DB, Q> impl<'me, DB, Q> QueryTable<'me, DB, Q>
where where
DB: plumbing::GetQueryTable<Q>, DB: plumbing::GetQueryTable<Q>,
Q: Query<DB>, Q: Query<DB>,
{ {
/// Constructs a new `QueryTable`.
pub fn new(db: &'me DB, storage: &'me Q::Storage) -> Self {
Self { db, storage }
}
/// Execute the query on a given input. Usually it's easier to /// Execute the query on a given input. Usually it's easier to
/// invoke the trait method directly. Note that for variadic /// invoke the trait method directly. Note that for variadic
/// queries (those with no inputs, or those with more than one /// queries (those with no inputs, or those with more than one
@ -495,7 +498,6 @@ where
/// set the value of an input query. /// set the value of an input query.
/// ///
/// [the `query_mut` method]: trait.Database#method.query_mut /// [the `query_mut` method]: trait.Database#method.query_mut
#[derive(new)]
pub struct QueryTableMut<'me, DB, Q> pub struct QueryTableMut<'me, DB, Q>
where where
DB: plumbing::GetQueryTable<Q>, DB: plumbing::GetQueryTable<Q>,
@ -505,11 +507,16 @@ where
storage: Arc<Q::Storage>, storage: Arc<Q::Storage>,
} }
impl<DB, Q> QueryTableMut<'_, DB, Q> impl<'me, DB, Q> QueryTableMut<'me, DB, Q>
where where
DB: plumbing::GetQueryTable<Q>, DB: plumbing::GetQueryTable<Q>,
Q: Query<DB>, Q: Query<DB>,
{ {
/// Constructs a new `QueryTableMut`.
pub fn new(db: &'me mut DB, storage: Arc<Q::Storage>) -> Self {
Self { db, storage }
}
fn database_key(&self, key: &Q::Key) -> DB::DatabaseKey { fn database_key(&self, key: &Q::Key) -> DB::DatabaseKey {
<DB as plumbing::GetQueryTable<Q>>::database_key(&self.db, key.clone()) <DB as plumbing::GetQueryTable<Q>>::database_key(&self.db, key.clone())
} }