Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/query-group-macro/tests/tuples.rs')
| -rw-r--r-- | crates/query-group-macro/tests/tuples.rs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/crates/query-group-macro/tests/tuples.rs b/crates/query-group-macro/tests/tuples.rs index af0e852695..b38ac2ed2b 100644 --- a/crates/query-group-macro/tests/tuples.rs +++ b/crates/query-group-macro/tests/tuples.rs @@ -4,36 +4,35 @@ mod logger_db; use expect_test::expect; use logger_db::LoggerDb; +#[salsa::input(singleton)] +struct InputString { + inner: String, +} + #[query_group] pub trait HelloWorldDatabase: salsa::Database { - #[salsa::input] - fn input_string(&self) -> String; - #[salsa::invoke_interned(length_query)] fn length_query(&self, key: ()) -> (usize, usize); } fn length_query(db: &dyn HelloWorldDatabase, _key: ()) -> (usize, usize) { - let len = db.input_string().len(); + let len = InputString::get(db).inner(db).len(); (len, len) } #[test] fn query() { - let mut db = LoggerDb::default(); + let db = LoggerDb::default(); - db.set_input_string(String::from("Hello, world!")); + _ = InputString::new(&db, String::from("Hello, world!")); let len = db.length_query(()); assert_eq!(len, (13, 13)); db.assert_logs(expect![[r#" [ "salsa_event(WillCheckCancellation)", - "salsa_event(WillExecute { database_key: create_data_HelloWorldDatabase(Id(0)) })", - "salsa_event(WillCheckCancellation)", - "salsa_event(DidValidateMemoizedValue { database_key: create_data_HelloWorldDatabase(Id(0)) })", - "salsa_event(WillCheckCancellation)", - "salsa_event(WillExecute { database_key: length_query_shim(Id(800)) })", + "salsa_event(WillExecute { database_key: create_data_HelloWorldDatabase(Id(400)) })", "salsa_event(WillCheckCancellation)", + "salsa_event(WillExecute { database_key: length_query_shim(Id(c00)) })", ]"#]]); } |