mirror of
https://github.com/salsa-rs/salsa.git
synced 2024-11-24 20:20:26 +00:00
fad97eeb6a
This had two unexpected consequences, one unfortunate, one "medium": * All `salsa::Database` must be `'static`. This falls out from `Q::DynDb` not having access to any lifetimes, but also the defaulting rules for `dyn QueryGroup` that make it `dyn QueryGroup + 'static`. We don't really support generic databases anyway yet so this isn't a big deal, and we can add workarounds later (ideally via GATs). * It is now statically impossible to invoke `snapshot` from a query, and so we don't need to test that it panics. This is because the signature of `snapshot` returns a `Snapshot<Self>` and that is not accessible to a `dyn QueryGroup` type. Similarly, invoking `Runtime::snapshot` directly is not possible becaues it is crate-private. So I removed the test. This seems ok, but eventually I would like to expose ways for queries to do parallel execution (matklad and I had talked about a "speculation" primitive for enabling that). * This commit is 99% boilerplate I did with search-and-replace. I also rolled in a few other changes I might have preferred to factor out, most notably removing the `GetQueryTable` plumbing trait in favor of free-methods, but it was awkward to factor them out and get all the generics right (so much simpler in this version).
51 lines
1 KiB
Rust
51 lines
1 KiB
Rust
#[salsa::query_group(HelloWorld)]
|
|
trait HelloWorldDatabase: salsa::Database {
|
|
#[salsa::input]
|
|
fn input(&self, a: u32, b: u32) -> u32;
|
|
|
|
fn none(&self) -> u32;
|
|
|
|
fn one(&self, k: u32) -> u32;
|
|
|
|
fn two(&self, a: u32, b: u32) -> u32;
|
|
|
|
fn trailing(&self, a: u32, b: u32) -> u32;
|
|
}
|
|
|
|
fn none(_db: &dyn HelloWorldDatabase) -> u32 {
|
|
22
|
|
}
|
|
|
|
fn one(_db: &dyn HelloWorldDatabase, k: u32) -> u32 {
|
|
k * 2
|
|
}
|
|
|
|
fn two(_db: &dyn HelloWorldDatabase, a: u32, b: u32) -> u32 {
|
|
a * b
|
|
}
|
|
|
|
fn trailing(_db: &dyn HelloWorldDatabase, a: u32, b: u32) -> u32 {
|
|
a - b
|
|
}
|
|
|
|
#[salsa::database(HelloWorld)]
|
|
#[derive(Default)]
|
|
struct DatabaseStruct {
|
|
storage: salsa::Storage<Self>,
|
|
}
|
|
|
|
impl salsa::Database for DatabaseStruct {}
|
|
|
|
#[test]
|
|
fn execute() {
|
|
let mut db = DatabaseStruct::default();
|
|
|
|
// test what happens with inputs:
|
|
db.set_input(1, 2, 3);
|
|
assert_eq!(db.input(1, 2), 3);
|
|
|
|
assert_eq!(db.none(), 22);
|
|
assert_eq!(db.one(11), 22);
|
|
assert_eq!(db.two(11, 2), 22);
|
|
assert_eq!(db.trailing(24, 2), 22);
|
|
}
|