Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/query-group-macro/tests/result.rs')
| -rw-r--r-- | crates/query-group-macro/tests/result.rs | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/crates/query-group-macro/tests/result.rs b/crates/query-group-macro/tests/result.rs index 06f7f403c7..ad7d8ae0a1 100644 --- a/crates/query-group-macro/tests/result.rs +++ b/crates/query-group-macro/tests/result.rs @@ -7,11 +7,13 @@ use query_group_macro::query_group; #[derive(Clone, Debug, PartialEq, Eq)] pub struct Error; +#[salsa::input(singleton)] +struct InputString { + inner: String, +} + #[query_group] pub trait ResultDatabase: salsa::Database { - #[salsa::input] - fn input_string(&self) -> String; - #[salsa::invoke_interned(length)] fn length(&self, key: ()) -> Result<usize, Error>; @@ -20,33 +22,29 @@ pub trait ResultDatabase: salsa::Database { } fn length(db: &dyn ResultDatabase, _key: ()) -> Result<usize, Error> { - Ok(db.input_string().len()) + Ok(InputString::get(db).inner(db).len()) } fn length2(db: &dyn ResultDatabase, _key: ()) -> Result<usize, Error> { - Ok(db.input_string().len()) + Ok(InputString::get(db).inner(db).len()) } #[test] fn test_queries_with_results() { - let mut db = LoggerDb::default(); + let db = LoggerDb::default(); let input = "hello"; - db.set_input_string(input.to_owned()); + _ = InputString::new(&db, input.to_owned()); assert_eq!(db.length(()), Ok(input.len())); assert_eq!(db.length2(()), Ok(input.len())); db.assert_logs(expect![[r#" [ "salsa_event(WillCheckCancellation)", - "salsa_event(WillExecute { database_key: create_data_ResultDatabase(Id(0)) })", - "salsa_event(WillCheckCancellation)", - "salsa_event(DidValidateMemoizedValue { database_key: create_data_ResultDatabase(Id(0)) })", - "salsa_event(WillCheckCancellation)", - "salsa_event(WillExecute { database_key: length_shim(Id(800)) })", - "salsa_event(WillCheckCancellation)", + "salsa_event(WillExecute { database_key: create_data_ResultDatabase(Id(400)) })", "salsa_event(WillCheckCancellation)", + "salsa_event(WillExecute { database_key: length_shim(Id(c00)) })", "salsa_event(WillCheckCancellation)", - "salsa_event(WillExecute { database_key: length2_shim(Id(c00)) })", "salsa_event(WillCheckCancellation)", + "salsa_event(WillExecute { database_key: length2_shim(Id(1000)) })", ]"#]]); } |