mirror of
https://github.com/salsa-rs/salsa.git
synced 2024-11-25 04:27:52 +00:00
93c30a953d
Switch to a procedural implementation of the `query_group!` macro, residing in the `components/salsa_macros` subcrate. Allow the user to override the invoked function via `salsa::invoke(...)` and the name of the generated query type via `salsa::query_type(...)`. In all tests, replace the `salsa::query_group! { ... }` invocations with the new attribute-style `#[salsa::query_group]` macro, and change them to the new naming scheme for query types (`...Query`). Update README, examples, and documentation.
66 lines
1.6 KiB
Rust
66 lines
1.6 KiB
Rust
use salsa::{Database, ParallelDatabase, Snapshot};
|
|
use std::panic::{self, AssertUnwindSafe};
|
|
|
|
#[salsa::query_group]
|
|
trait PanicSafelyDatabase: salsa::Database {
|
|
#[salsa::input]
|
|
fn one(&self) -> usize;
|
|
|
|
fn panic_safely(&self) -> ();
|
|
}
|
|
|
|
fn panic_safely(db: &impl PanicSafelyDatabase) -> () {
|
|
assert_eq!(db.one(), 1);
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct DatabaseStruct {
|
|
runtime: salsa::Runtime<DatabaseStruct>,
|
|
}
|
|
|
|
impl salsa::Database for DatabaseStruct {
|
|
fn salsa_runtime(&self) -> &salsa::Runtime<DatabaseStruct> {
|
|
&self.runtime
|
|
}
|
|
}
|
|
|
|
impl salsa::ParallelDatabase for DatabaseStruct {
|
|
fn snapshot(&self) -> Snapshot<Self> {
|
|
Snapshot::new(DatabaseStruct {
|
|
runtime: self.runtime.snapshot(self),
|
|
})
|
|
}
|
|
}
|
|
|
|
salsa::database_storage! {
|
|
struct DatabaseStorage for DatabaseStruct {
|
|
impl PanicSafelyDatabase {
|
|
fn one() for OneQuery;
|
|
fn panic_safely() for PanicSafelyQuery;
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn should_panic_safely() {
|
|
let mut db = DatabaseStruct::default();
|
|
|
|
// Invoke `db.panic_safely() without having set `db.one`. `db.one` will
|
|
// default to 0 and we should catch the panic.
|
|
let result = panic::catch_unwind(AssertUnwindSafe({
|
|
let db = db.snapshot();
|
|
move || db.panic_safely()
|
|
}));
|
|
assert!(result.is_err());
|
|
|
|
// Set `db.one` to 1 and assert ok
|
|
db.query_mut(OneQuery).set((), 1);
|
|
let result = panic::catch_unwind(AssertUnwindSafe(|| db.panic_safely()));
|
|
assert!(result.is_ok())
|
|
}
|
|
|
|
#[test]
|
|
fn storages_are_unwind_safe() {
|
|
fn check_unwind_safe<T: std::panic::UnwindSafe>() {}
|
|
check_unwind_safe::<&DatabaseStruct>();
|
|
}
|