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

Remove on_propagated_panic

Browse source
This commit is contained in:
Jonas Schievink 2021-05-18 15:17:53 +02:00
parent 5ac74aba04
commit 877d3f20d1
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/derived/slot.rs
View file

@ -1,4 +1,3 @@
use crate::blocking_future::{BlockingFuture, Promise};
use crate::debug::TableEntry;
use crate::derived::MemoizationPolicy;
use crate::durability::Durability;
@ -10,6 +9,10 @@ use crate::revision::Revision;
use crate::runtime::Runtime;
use crate::runtime::RuntimeId;
use crate::runtime::StampedValue;
use crate::{
blocking_future::{BlockingFuture, Promise},
Canceled,
};
use crate::{
CycleError, Database, DatabaseKeyIndex, DiscardIf, DiscardWhat, Event, EventKind, QueryDb,
SweepStrategy,
@ -353,7 +356,7 @@ where
},
});
let result = future.wait().unwrap_or_else(|| db.on_propagated_panic());
let result = future.wait().unwrap_or_else(|| Canceled::throw());
ProbeState::UpToDate(if result.cycle.is_empty() {
Ok(result.value)
} else {
@ -576,7 +579,7 @@ where
// Release our lock on `self.state`, so other thread can complete.
std::mem::drop(state);
let result = future.wait().unwrap_or_else(|| db.on_propagated_panic());
let result = future.wait().unwrap_or_else(|| Canceled::throw());
return !result.cycle.is_empty() || result.value.changed_at > revision;
}

6
src/lib.rs
View file

@ -74,12 +74,6 @@ pub trait Database: plumbing::DatabaseOps {
#![allow(unused_variables)]
}
/// This function is invoked when a dependent query is being computed by the
/// other thread, and that thread panics.
fn on_propagated_panic(&self) -> ! {
Canceled::throw()
}
/// Gives access to the underlying salsa runtime.
fn salsa_runtime(&self) -> &Runtime {
self.ops_salsa_runtime()