From a5474e8c76cb96fd344a97bc672cff9b648f2efe Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Fri, 24 Apr 2026 14:45:01 -0700 Subject: [PATCH] Fix `clippy` lints Like Smithay, disable `clippy::collapsible_match`. It seems prone to offering dubious suggestions. --- src/config/mod.rs | 9 ++------- src/lib.rs | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/config/mod.rs b/src/config/mod.rs index d5878287..66cb2b83 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -453,8 +453,7 @@ impl Config { .collect::>(); let mut found_outputs = Vec::new(); - for (name, output_config) in infos.iter().map(|o| &o.connector).zip(configs.into_iter()) - { + for (name, output_config) in infos.iter().map(|o| &o.connector).zip(configs) { let output = outputs.iter().find(|o| &o.name() == name).unwrap().clone(); let enabled = output_config.enabled.clone(); *output @@ -478,11 +477,7 @@ impl Config { ) { warn!(?err, "Failed to set new config."); found_outputs.clear(); - for (output, output_config) in outputs - .clone() - .into_iter() - .zip(known_good_configs.into_iter()) - { + for (output, output_config) in outputs.clone().into_iter().zip(known_good_configs) { let enabled = output_config.enabled.clone(); *output .user_data() diff --git a/src/lib.rs b/src/lib.rs index 11ffa1d6..09d1b961 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,8 @@ #![allow( clippy::too_many_arguments, clippy::type_complexity, - clippy::len_without_is_empty + clippy::len_without_is_empty, + clippy::collapsible_match )] // SPDX-License-Identifier: GPL-3.0-only