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

add a Memoized struct

Browse source
This commit is contained in:
Niko Matsakis 2018-09-29 07:24:53 -04:00
parent 738e285c5c
commit 907fe96628
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/memoized.rs
View file

@ -33,7 +33,12 @@ enum QueryState<V> {
InProgress, InProgress,
/// We have computed the query already, and here is the result. /// We have computed the query already, and here is the result.
Memoized(V), Memoized(Memoized<V>),
}
#[derive(Debug)]
struct Memoized<V> {
value: V,
} }
impl<QC, Q> Default for MemoizedStorage<QC, Q> impl<QC, Q> Default for MemoizedStorage<QC, Q>
@ -64,7 +69,7 @@ where
if let Some(value) = map_read.get(key) { if let Some(value) = map_read.get(key) {
return match value { return match value {
QueryState::InProgress => Err(CycleDetected), QueryState::InProgress => Err(CycleDetected),
QueryState::Memoized(value) => Ok(value.clone()), QueryState::Memoized(m) => Ok(m.value.clone()),
}; };
} }
@ -81,7 +86,12 @@ where
{ {
let mut map_write = self.map.write(); let mut map_write = self.map.write();
let old_value = map_write.insert(key.clone(), QueryState::Memoized(value.clone())); let old_value = map_write.insert(
key.clone(),
QueryState::Memoized(Memoized {
value: value.clone(),
}),
);
assert!( assert!(
match old_value { match old_value {
Some(QueryState::InProgress) => true, Some(QueryState::InProgress) => true,