deps: bump workshop-rs to v0.7.0

Cargo.toml

@@ -10,8 +10,8 @@ license = "AGPL-3.0-or-later"
 repository = "https://github.com/wrightkit/wright"
 
 [workspace.dependencies]
-# Canonical Workshop core; pinned to the workshop-rs 1.0 release candidate (workshop-rs v0.6.4).
-workshop-rs = { git = "https://github.com/wrightkit/workshop-rs.git", rev = "712c839f09f9c4daaf65aa7ae619f4fca065e34d" }
+# Canonical Workshop core; pinned to the workshop-rs 1.0 release candidate (workshop-rs v0.7.0).
+workshop-rs = { git = "https://github.com/wrightkit/workshop-rs.git", rev = "43a8b45f2703903233f4eba6bd27deb9b6ba675f" }
 libc = "0.2"
 serde = "1"
 serde_json = "1"

crates/wright-transform/src/pipeline.rs

@@ -330,37 +330,35 @@ mod tests {
         use workshop_rs::{Action, Condition, Event, Program, Rule, Value};
 
         let mut program = Program::new();
-        program.rule(Rule {
-            name: "r".to_string(),
-            disabled: false,
-            event: Event::Global,
-            conditions: vec![Condition::new(Value::call(
-                "+",
-                [Value::call("*", [2.0.into(), 3.0.into()]), 4.0.into()],
-            ))],
-            actions: vec![Action::Call {
-                name: "probe".to_string(),
-                args: vec![
-                    Value::Array(vec![
-                        Value::call("+", [1.0.into(), 2.0.into()]),
-                        Value::call("==", [4.0.into(), 4.0.into()]),
-                    ]),
-                    Value::call("and", [true.into(), false.into()]),
-                    Value::call(
-                        "valueInArray",
-                        [
-                            Value::Array(vec![1.0.into(), 2.0.into()]),
-                            Value::call("+", [0.0.into(), 0.0.into()]),
-                        ],
-                    ),
-                    Value::Vector {
-                        x: Box::new(0.0.into()),
-                        y: Box::new(1.0.into()),
-                        z: Box::new(0.0.into()),
-                    },
-                ],
-            }],
-        });
+        program.rule(
+            Rule::new("r", Event::Global)
+                .condition(Condition::new(Value::call(
+                    "+",
+                    [Value::call("*", [2.0.into(), 3.0.into()]), 4.0.into()],
+                )))
+                .action(Action::Call {
+                    name: "probe".to_string(),
+                    args: vec![
+                        Value::Array(vec![
+                            Value::call("+", [1.0.into(), 2.0.into()]),
+                            Value::call("==", [4.0.into(), 4.0.into()]),
+                        ]),
+                        Value::call("and", [true.into(), false.into()]),
+                        Value::call(
+                            "valueInArray",
+                            [
+                                Value::Array(vec![1.0.into(), 2.0.into()]),
+                                Value::call("+", [0.0.into(), 0.0.into()]),
+                            ],
+                        ),
+                        Value::Vector {
+                            x: Box::new(0.0.into()),
+                            y: Box::new(1.0.into()),
+                            z: Box::new(0.0.into()),
+                        },
+                    ],
+                }),
+        );
 
         let results = run_canonical(&mut program, Profile::Compat).expect("canonical pipeline");
         assert!(results[0].stats.changed > 0);

crates/wright-transform/tests/pipeline.rs

@@ -17,16 +17,12 @@ fn arithmetic_program() -> Program {
     let multiply = Value::call("*", [Value::number(2.0), Value::number(3.0)]);
     let add = Value::call("+", [len, multiply]);
 
-    program.rule(Rule {
-        name: "compute".to_string(),
-        disabled: false,
-        event: Event::Global,
-        conditions: vec![],
-        actions: vec![Action::SetGlobalVariable {
+    program.rule(
+        Rule::new("compute", Event::Global).action(Action::SetGlobalVariable {
             variable: "result".to_string(),
             value: add,
-        }],
-    });
+        }),
+    );
     program
 }