Update Trunk and make cargo lea output less verbose.

eclipse-opendut · Jan 22, 2025 · 3d0efbb · 3d0efbb
1 parent 8af4e69
commit 3d0efbb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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,16 +74,16 @@ pub mod distribution_build {
 pub mod run {
     use super::*;
 
-    #[tracing::instrument]
-    pub fn run(pass_through: Vec<String>) -> crate::Result {
+    #[tracing::instrument(skip_all)]
+    pub fn run(passthrough: Vec<String>) -> crate::Result {
         install_requirements()?;
 
         Command::new("trunk")
             .args([
                 "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
@@ -5,15 +5,15 @@ use std::process::Command;
 pub struct RunCli {
     /// Additional parameters to pass through to the started program
     #[arg(raw=true)]
-    pub pass_through: Vec<String>,
+    pub passthrough: Vec<String>,
 }
 
 impl RunCli {
     #[tracing::instrument(name="run", skip(self))]
     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
@@ -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"