auto-fix machete

tooling/xtask/src/tasks/workflows/autofix_pr.rs

@@ -1,6 +1,7 @@
 use gh_workflow::*;
 
 use crate::tasks::workflows::{
+    run_tests::install_cargo_machete,
     runners,
     steps::{self, FluentBuilder, NamedJob, named},
     vars::{self, StepOutput, WorkflowInput},
@@ -73,6 +74,10 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo
         named::bash("./script/prettier --write")
     }
 
+    fn run_cargo_machete_fix() -> Step<Run> {
+        named::bash("cargo machete --fix")
+    }
+
     fn create_patch() -> Step<Run> {
         named::bash(indoc::indoc! {r#"
             if git diff --quiet; then
@@ -101,6 +106,8 @@ fn run_autofix(pr_number: &WorkflowInput, run_clippy: &WorkflowInput) -> NamedJo
             .add_step(steps::setup_pnpm())
             .add_step(run_prettier_fix())
             .add_step(run_cargo_fmt())
+            .add_step(install_cargo_machete())
+            .add_step(run_cargo_machete_fix())
             .add_step(run_clippy_fix().if_condition(Expression::new(run_clippy.to_string())))
             .add_step(create_patch())
             .add_step(upload_patch_artifact())

tooling/xtask/src/tasks/workflows/run_tests.rs

@@ -245,24 +245,19 @@ fn check_style() -> NamedJob {
     )
 }
 
-fn check_dependencies() -> NamedJob {
-    fn install_cargo_machete() -> Step<Use> {
-        named::uses(
-            "clechasseur",
-            "rs-cargo",
-            "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2
-        )
-        .add_with(("command", "install"))
-        .add_with(("args", "cargo-machete@0.7.0"))
-    }
+pub fn install_cargo_machete() -> Step<Use> {
+    named::uses(
+        "clechasseur",
+        "rs-cargo",
+        "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2
+    )
+    .add_with(("command", "install"))
+    .add_with(("args", "cargo-machete@0.7.0"))
+}
 
-    fn run_cargo_machete() -> Step<Use> {
-        named::uses(
-            "clechasseur",
-            "rs-cargo",
-            "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2
-        )
-        .add_with(("command", "machete"))
+fn check_dependencies() -> NamedJob {
+    fn run_cargo_machete() -> Step<Run> {
+        named::bash("cargo machete")
     }
 
     fn check_cargo_lock() -> Step<Run> {
@@ -286,6 +281,7 @@ fn check_dependencies() -> NamedJob {
             .add_step(steps::cache_rust_dependencies_namespace())
             .add_step(install_cargo_machete())
             .add_step(run_cargo_machete())
+            .add_step(steps::trigger_autofix(false))
             .add_step(check_cargo_lock())
             .add_step(check_vulnerable_dependencies()),
     )