From 401cb58f030d95c41e5c525523a68305ec08dc2f Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 30 Jun 2026 05:46:02 -0700 Subject: [PATCH] packaging: resolve collapsible_match warnings for Rust 1.95 Rust 1.95's clippy introduces new `collapsible_match` lints for `if` blocks nested inside match arms that can be expressed as match guards. Generated-by: IBM Bob Signed-off-by: stevenhorsman --- .../kata-deploy/binary/src/runtime/containerd.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/packaging/kata-deploy/binary/src/runtime/containerd.rs b/tools/packaging/kata-deploy/binary/src/runtime/containerd.rs index e4d16f05b1..2d1b23cc46 100644 --- a/tools/packaging/kata-deploy/binary/src/runtime/containerd.rs +++ b/tools/packaging/kata-deploy/binary/src/runtime/containerd.rs @@ -691,14 +691,12 @@ pub async fn setup_containerd_config_files(runtime: &str, config: &Config) -> Re } fs::File::create(drop_in_file_path)?; } - "containerd" => { - if !Path::new(&config.containerd_conf_file).exists() { - if let Some(parent) = Path::new(&config.containerd_conf_file).parent() { - if parent.exists() { - // Write output to file - let output = utils::host_exec(&["containerd", "config", "default"])?; - fs::write(&config.containerd_conf_file, output)?; - } + "containerd" if !Path::new(&config.containerd_conf_file).exists() => { + if let Some(parent) = Path::new(&config.containerd_conf_file).parent() { + if parent.exists() { + // Write output to file + let output = utils::host_exec(&["containerd", "config", "default"])?; + fs::write(&config.containerd_conf_file, output)?; } } }