Update test snapshots after rebase

salsa-rs · Jun 23, 2024 · ff0bcd6 · ff0bcd6
1 parent df5f563
commit ff0bcd6
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 85 deletions.
diff --git a/tests/debug.rs b/tests/debug.rs
@@ -52,9 +52,7 @@ fn input() {
 
     // debug includes all fields
     let actual = format!("{:?}", complex_struct.debug(&db));
-    let expected = expect![[
-        r#"ComplexStruct { [salsa id]: 0, my_input: MyInput { [salsa id]: 0, field: 22 }, not_salsa: NotSalsa { field: "it's salsa time" } }"#
-    ]];
+    let expected = expect![[r#"ComplexStruct { [salsa id]: Id(0), my_input: MyInput { [salsa id]: Id(0), field: 22 }, not_salsa: NotSalsa { field: "it's salsa time" } }"#]];
     expected.assert_eq(&actual);
 }
 
@@ -74,7 +72,7 @@ fn untracked_dependencies() {
 
     let s = leak_debug_string(&db, input);
     expect![[r#"
-        "MyInput { [salsa id]: 0, field: 22 }"
+        "MyInput { [salsa id]: Id(0), field: 22 }"
     "#]]
     .assert_debug_eq(&s);
 
@@ -118,7 +116,7 @@ fn custom_debug_impl() {
 
     let s = leak_derived_custom(&db, input, 23);
     expect![[r#"
-        "MyInput { [salsa id]: 0, field: 22 } / 23"
+        "MyInput { [salsa id]: Id(0), field: 22 } / 23"
     "#]]
     .assert_debug_eq(&s);
 }
diff --git a/tests/deletion-cascade.rs b/tests/deletion-cascade.rs
@@ -96,8 +96,8 @@ fn basic() {
     assert_eq!(final_result(&db, input), 2 * 2 + 2);
     db.assert_logs(expect![[r#"
         [
-            "final_result(MyInput { [salsa id]: 0 })",
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     // Creates only 2 tracked structs in this revision, should delete 1
@@ -118,12 +118,12 @@ fn basic() {
     assert_eq!(final_result(&db, input), 2);
     db.assert_logs(expect![[r#"
         [
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
             "salsa_event(WillDiscardStaleOutput { execute_key: create_tracked_structs(0), output_key: MyTracked(2) })",
             "salsa_event(DidDiscard { key: MyTracked(2) })",
             "salsa_event(DidDiscard { key: contribution_from_struct(2) })",
             "salsa_event(DidDiscard { key: MyTracked(5) })",
             "salsa_event(DidDiscard { key: copy_field(5) })",
-            "final_result(MyInput { [salsa id]: 0 })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 }
diff --git a/tests/deletion.rs b/tests/deletion.rs
@@ -89,8 +89,8 @@ fn basic() {
     assert_eq!(final_result(&db, input), 2 * 2 + 2);
     db.assert_logs(expect![[r#"
         [
-            "final_result(MyInput { [salsa id]: 0 })",
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     // Creates only 2 tracked structs in this revision, should delete 1
@@ -104,10 +104,10 @@ fn basic() {
     assert_eq!(final_result(&db, input), 2);
     db.assert_logs(expect![[r#"
         [
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
             "salsa_event(WillDiscardStaleOutput { execute_key: create_tracked_structs(0), output_key: MyTracked(2) })",
             "salsa_event(DidDiscard { key: MyTracked(2) })",
             "salsa_event(DidDiscard { key: contribution_from_struct(2) })",
-            "final_result(MyInput { [salsa id]: 0 })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 }
diff --git a/tests/elided-lifetime-in-tracked-fn.rs b/tests/elided-lifetime-in-tracked-fn.rs
@@ -59,8 +59,8 @@ fn execute() {
     assert_eq!(final_result(&db, input), 22);
     db.assert_logs(expect![[r#"
         [
-            "final_result(MyInput { [salsa id]: 0 })",
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     // Intermediate result is the same, so final result does
@@ -69,14 +69,14 @@ fn execute() {
     assert_eq!(final_result(&db, input), 22);
     db.assert_logs(expect![[r#"
         [
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     input.set_field(&mut db).to(24);
     assert_eq!(final_result(&db, input), 24);
     db.assert_logs(expect![[r#"
         [
-            "intermediate_result(MyInput { [salsa id]: 0 })",
-            "final_result(MyInput { [salsa id]: 0 })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 }
diff --git a/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs b/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs
@@ -79,13 +79,13 @@ fn execute() {
     assert_eq!(final_result_depends_on_x(&db, input), 22);
     db.assert_logs(expect![[r#"
         [
-            "final_result_depends_on_x(MyInput { [salsa id]: 0 })",
+            "final_result_depends_on_x(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     assert_eq!(final_result_depends_on_y(&db, input), 22);
     db.assert_logs(expect![[r#"
         [
-            "final_result_depends_on_y(MyInput { [salsa id]: 0 })",
+            "final_result_depends_on_y(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     input.set_field(&mut db).to(23);
@@ -95,7 +95,7 @@ fn execute() {
     assert_eq!(final_result_depends_on_x(&db, input), 24);
     db.assert_logs(expect![[r#"
         [
-            "final_result_depends_on_x(MyInput { [salsa id]: 0 })",
+            "final_result_depends_on_x(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     // y = 23 / 2 = 11

diff --git a/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs b/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs
@@ -58,21 +58,21 @@ fn execute() {
     assert_eq!(result_depends_on_x(&db, input), 23);
     db.assert_logs(expect![[r#"
         [
-            "result_depends_on_x(MyInput { [salsa id]: 0 })",
+            "result_depends_on_x(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     assert_eq!(result_depends_on_y(&db, input), 32);
     db.assert_logs(expect![[r#"
         [
-            "result_depends_on_y(MyInput { [salsa id]: 0 })",
+            "result_depends_on_y(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     input.set_x(&mut db).to(23);
     // input x changes, so result depends on x needs to be recomputed;
     assert_eq!(result_depends_on_x(&db, input), 24);
     db.assert_logs(expect![[r#"
         [
-            "result_depends_on_x(MyInput { [salsa id]: 0 })",
+            "result_depends_on_x(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     // input y is the same, so result depends on y

diff --git a/tests/hello_world.rs b/tests/hello_world.rs
@@ -59,8 +59,8 @@ fn execute() {
     assert_eq!(final_result(&db, input), 22);
     db.assert_logs(expect![[r#"
         [
-            "final_result(MyInput { [salsa id]: 0 })",
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     // Intermediate result is the same, so final result does
@@ -69,15 +69,15 @@ fn execute() {
     assert_eq!(final_result(&db, input), 22);
     db.assert_logs(expect![[r#"
         [
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     input.set_field(&mut db).to(24);
     assert_eq!(final_result(&db, input), 24);
     db.assert_logs(expect![[r#"
         [
-            "intermediate_result(MyInput { [salsa id]: 0 })",
-            "final_result(MyInput { [salsa id]: 0 })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 }
 
@@ -90,8 +90,8 @@ fn red_herring() {
     assert_eq!(final_result(&db, input), 22);
     db.assert_logs(expect![[r#"
         [
-            "final_result(MyInput { [salsa id]: 0 })",
-            "intermediate_result(MyInput { [salsa id]: 0 })",
+            "final_result(MyInput { [salsa id]: Id(0) })",
+            "intermediate_result(MyInput { [salsa id]: Id(0) })",
         ]"#]]);
 
     // Create a distinct input and mutate it.

diff --git a/tests/input_with_ids.rs b/tests/input_with_ids.rs
@@ -38,7 +38,7 @@ fn test_debug() {
     let input = MyInput::new(&mut db, 50, 10, Field {});
 
     let actual = format!("{:?}", input.debug(&db));
-    let expected = expect!["MyInput { [salsa id]: 0, id_one: 50, id_two: 10, field: Field }"];
+    let expected = expect!["MyInput { [salsa id]: Id(0), id_one: 50, id_two: 10, field: Field }"];
     expected.assert_eq(&actual);
 }
 

diff --git a/tests/interned-struct-with-lifetime.rs b/tests/interned-struct-with-lifetime.rs
@@ -52,7 +52,7 @@ fn execute() {
     let mut db = Database::default();
 
     expect![[r#"
-        "InternedPair { [salsa id]: 0, data: (InternedString { [salsa id]: 0, data: \"Hello, \" }, InternedString { [salsa id]: 1, data: \"World, \" }) }"
+        "InternedPair { [salsa id]: Id(0), data: (InternedString { [salsa id]: Id(0), data: \"Hello, \" }, InternedString { [salsa id]: Id(1), data: \"World, \" }) }"
     "#]].assert_debug_eq(&intern_stuff(&db));
     db.assert_logs(expect!["[]"]);
 }
diff --git a/tests/singleton.rs b/tests/singleton.rs
@@ -68,6 +68,6 @@ fn debug() {
     let db = Database::default();
     let input = MyInput::new(&db, 3, 4);
     let actual = format!("{:?}", input.debug(&db));
-    let expected = expect!["MyInput { [salsa id]: 0, field: 3, id_field: 4 }"];
+    let expected = expect!["MyInput { [salsa id]: Id(0), field: 3, id_field: 4 }"];
     expected.assert_eq(&actual);
 }