From 3d0efbb7b0b9f25123820fde6ea3696b2799dd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20M=C3=A4rkle?= Date: Mon, 20 Jan 2025 17:33:31 +0100 Subject: [PATCH] Update Trunk and make `cargo lea` output less verbose. --- .ci/cargo-ci/src/packages/lea.rs | 8 ++++---- .ci/cargo-ci/src/tasks/run.rs | 4 ++-- Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci/cargo-ci/src/packages/lea.rs b/.ci/cargo-ci/src/packages/lea.rs index 513c95813..87e0cec65 100644 --- a/.ci/cargo-ci/src/packages/lea.rs +++ b/.ci/cargo-ci/src/packages/lea.rs @@ -37,7 +37,7 @@ impl LeaCli { pub fn default_handling(self) -> crate::Result { match self.task { TaskCli::Build => build::build()?, - TaskCli::Run(cli) => run::run(cli.pass_through)?, + TaskCli::Run(cli) => run::run(cli.passthrough)?, TaskCli::Licenses(cli) => cli.default_handling(PackageSelection::Single(PACKAGE))?, TaskCli::DistributionBuild => distribution_build::distribution_build()?, }; @@ -74,8 +74,8 @@ pub mod distribution_build { pub mod run { use super::*; - #[tracing::instrument] - pub fn run(pass_through: Vec) -> crate::Result { + #[tracing::instrument(skip_all)] + pub fn run(passthrough: Vec) -> crate::Result { install_requirements()?; Command::new("trunk") @@ -83,7 +83,7 @@ pub mod run { "watch", "--release", ]) - .args(pass_through) + .args(passthrough) .current_dir(self_dir()) .run_requiring_success()?; Ok(()) diff --git a/.ci/cargo-ci/src/tasks/run.rs b/.ci/cargo-ci/src/tasks/run.rs index 34f4e2bbd..f791caac2 100644 --- a/.ci/cargo-ci/src/tasks/run.rs +++ b/.ci/cargo-ci/src/tasks/run.rs @@ -5,7 +5,7 @@ use std::process::Command; pub struct RunCli { /// Additional parameters to pass through to the started program #[arg(raw=true)] - pub pass_through: Vec, + pub passthrough: Vec, } impl RunCli { @@ -13,7 +13,7 @@ impl RunCli { pub fn default_handling(&self, package: crate::Package) -> crate::Result { Command::new("cargo") .args(["run", "--package", &package.ident(), "--"]) - .args(&self.pass_through) + .args(&self.passthrough) .status()?; Ok(()) diff --git a/Cargo.toml b/Cargo.toml index b23b3dacc..38a56c5ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -198,7 +198,7 @@ cross.version = "0.2.5" diesel_cli.version = "2.2.4" mdbook.version = "0.4.42" mdbook-plantuml.version = "0.8.0" -trunk.version = "0.21.4" +trunk.version = "0.21.7" [workspace.lints.clippy] unnecessary_lazy_evaluations = "allow"