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

wip

Browse source
This commit is contained in:
Niko Matsakis 2024-07-16 06:05:20 -04:00
parent 8a39bf029b
commit a0bdff5af7
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs
View file

@ -7,17 +7,10 @@ mod common;
use common::{HasLogger, Logger}; use common::{HasLogger, Logger};
use expect_test::expect; use expect_test::expect;
use salsa::Setter;
#[salsa::jar(db = Db)] #[salsa::db]
struct Jar( trait Db: salsa::Database + HasLogger {}
MyInput,
MyTracked<'_>,
final_result_depends_on_x,
final_result_depends_on_y,
intermediate_result,
);
trait Db: salsa::DbWithJar<Jar> + HasLogger {}
#[salsa::input] #[salsa::input]
struct MyInput { struct MyInput {
@ -47,15 +40,17 @@ fn intermediate_result<'db>(db: &'db dyn Db, input: MyInput) -> MyTracked<'db> {
MyTracked::new(db, (input.field(db) + 1) / 2, input.field(db) / 2) MyTracked::new(db, (input.field(db) + 1) / 2, input.field(db) / 2)
} }
#[salsa::db(Jar)] #[salsa::db]
#[derive(Default)] #[derive(Default)]
struct Database { struct Database {
storage: salsa::Storage<Self>, storage: salsa::Storage<Self>,
logger: Logger, logger: Logger,
} }
#[salsa::db]
impl salsa::Database for Database {} impl salsa::Database for Database {}
#[salsa::db]
impl Db for Database {} impl Db for Database {}
impl HasLogger for Database { impl HasLogger for Database {

11
tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs
View file

@ -7,11 +7,10 @@ mod common;
use common::{HasLogger, Logger}; use common::{HasLogger, Logger};
use expect_test::expect; use expect_test::expect;
use salsa::Setter;
#[salsa::jar(db = Db)] #[salsa::db]
struct Jar(MyInput, result_depends_on_x, result_depends_on_y); trait Db: salsa::Database + HasLogger {}
trait Db: salsa::DbWithJar<Jar> + HasLogger {}
#[salsa::input] #[salsa::input]
struct MyInput { struct MyInput {
@ -31,15 +30,17 @@ fn result_depends_on_y(db: &dyn Db, input: MyInput) -> u32 {
input.y(db) - 1 input.y(db) - 1
} }
#[salsa::db(Jar)] #[salsa::db]
#[derive(Default)] #[derive(Default)]
struct Database { struct Database {
storage: salsa::Storage<Self>, storage: salsa::Storage<Self>,
logger: Logger, logger: Logger,
} }
#[salsa::db]
impl salsa::Database for Database {} impl salsa::Database for Database {}
#[salsa::db]
impl Db for Database {} impl Db for Database {}
impl HasLogger for Database { impl HasLogger for Database {