From 15254c1755ef26909ba4ef00d1de5da4445c895c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 10 Jul 2024 11:58:49 +0200 Subject: [PATCH] various clippy fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- Cargo.toml | 2 +- src/bin/proxmox-offline-mirror.rs | 7 +++---- src/bin/proxmox_offline_mirror_cmds/config.rs | 4 ++-- src/bin/proxmox_offline_mirror_cmds/subscription.rs | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 39461c5..a494ac8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ proxmox-apt = "0.11" proxmox-apt-api-types = "1.0" proxmox-async = "0.4" proxmox-http = { version = "0.9", features = [ "client-sync", "client-trait" ]} -proxmox-router = { version = "2", features = [ "cli" ], default_features = false } +proxmox-router = { version = "2", features = [ "cli" ], default-features = false } proxmox-schema = { version = "3", features = [ "api-macro" ] } proxmox-section-config = "2" proxmox-serde = "0.1" diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs index 7699b4b..c3eb902 100644 --- a/src/bin/proxmox-offline-mirror.rs +++ b/src/bin/proxmox-offline-mirror.rs @@ -432,12 +432,11 @@ fn action_add_mirror(config: &SectionConfigData) -> Result, Er (Some(ProductType::Pmg), "PMG"), (None, "None"), ]; - use_subscription = read_selection_from_tty( + use_subscription.clone_from(read_selection_from_tty( "Does this repository require a valid Proxmox subscription key", subscription_products, None, - )? - .clone(); + )?); (repo, key_path, architectures, None, SkipConfig::default()) }; @@ -707,7 +706,7 @@ fn action_add_key(config: &SectionConfigData) -> Result }; let key = read_string_from_tty("Please enter subscription key", None)?; - if config.sections.get(&key).is_some() { + if config.sections.contains_key(&key) { bail!("Key entry for '{key}' already exists - please use 'key refresh' or 'key update'!"); } diff --git a/src/bin/proxmox_offline_mirror_cmds/config.rs b/src/bin/proxmox_offline_mirror_cmds/config.rs index 696da11..d0d9756 100644 --- a/src/bin/proxmox_offline_mirror_cmds/config.rs +++ b/src/bin/proxmox_offline_mirror_cmds/config.rs @@ -147,7 +147,7 @@ async fn add_mirror( let (mut section_config, _digest) = proxmox_offline_mirror::config::config(&config)?; - if section_config.sections.get(&data.id).is_some() { + if section_config.sections.contains_key(&data.id) { param_bail!("name", "mirror config entry '{}' already exists.", data.id); } @@ -391,7 +391,7 @@ async fn add_medium( let (mut section_config, _digest) = proxmox_offline_mirror::config::config(&config)?; - if section_config.sections.get(&data.id).is_some() { + if section_config.sections.contains_key(&data.id) { param_bail!("name", "config section '{}' already exists.", data.id); } diff --git a/src/bin/proxmox_offline_mirror_cmds/subscription.rs b/src/bin/proxmox_offline_mirror_cmds/subscription.rs index c5b8f3d..72275e6 100644 --- a/src/bin/proxmox_offline_mirror_cmds/subscription.rs +++ b/src/bin/proxmox_offline_mirror_cmds/subscription.rs @@ -210,7 +210,7 @@ async fn add_mirror_key(config: Option, key: String, _param: Value) -> R let (mut section_config, _digest) = proxmox_offline_mirror::config::config(&config)?; - if section_config.sections.get(&key).is_some() { + if section_config.sections.contains_key(&key) { param_bail!( "key", "key entry for '{}' already exists - did you mean to update or refresh?", @@ -289,7 +289,7 @@ async fn add_key( let (mut section_config, _digest) = proxmox_offline_mirror::config::config(&config)?; - if section_config.sections.get(&data.key).is_some() { + if section_config.sections.contains_key(&data.key) { param_bail!( "key", "key entry for '{}' already exists - did you mean to update or refresh?",