Proxmox/proxmox-backup
5
0
Fork 0
mirror of git://git.proxmox.com/git/proxmox-backup.git synced 2025-01-21 18:03:59 +03:00
Code Releases Activity

replace get(key).is_none() with !contains_key()

Browse Source 
Fixes the clippy warning:

warning: unnecessary use of `get(&user2).is_none()`
    --> pbs-config/src/acl.rs:1067:36
     |
1067 |                 assert!(node.users.get(&user2).is_none());
     |                         -----------^^^^^^^^^^^^^^^^^^^^^
     |                         |
     |                         help: replace it with: `!node.users.contains_key(&user2)`
     |
     = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_get_then_check

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
This commit is contained in:
Maximiliano Sandoval 2024-06-26 15:05:59 +02:00 committed by Wolfgang Bumiller
parent f3f3c67267
commit 1d836ed32a
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pbs-config/src/acl.rs
View File

@ -1047,7 +1047,7 @@ acl:1:/storage/store1:user1@pbs:DatastoreBackup
let node = tree.find_node(path);
assert!(node.is_some());
if let Some(node) = node {
assert!(node.users.get(&user1).is_none());
assert!(!node.users.contains_key(&user1));
}
}
for path in &user2_paths {
@ -1064,7 +1064,7 @@ acl:1:/storage/store1:user1@pbs:DatastoreBackup
let node = tree.find_node(path);
assert!(node.is_some());
if let Some(node) = node {
assert!(node.users.get(&user2).is_none());
assert!(!node.users.contains_key(&user2));
}
}

2
pbs-config/src/network/parser.rs
View File

@ -585,7 +585,7 @@ impl<R: BufRead> NetworkParser<R> {
}
}
if config.interfaces.get("lo").is_none() {
if !config.interfaces.contains_key("lo") {
let mut interface = Interface::new(String::from("lo"));
set_method_v4(&mut interface, NetworkConfigMethod::Loopback)?;
interface.interface_type = NetworkInterfaceType::Loopback;

2
pbs-config/src/user.rs
View File

@ -57,7 +57,7 @@ pub fn config() -> Result<(SectionConfigData, [u8; 32]), Error> {
let digest = openssl::sha::sha256(content.as_bytes());
let mut data = CONFIG.parse(USER_CFG_FILENAME, &content)?;
if data.sections.get("root@pam").is_none() {
if !data.sections.contains_key("root@pam") {
let user: User = User {
userid: Userid::root_userid().clone(),
comment: Some("Superuser".to_string()),

2
src/api2/access/acl.rs
View File

@ -233,7 +233,7 @@ pub fn update_acl(
if !delete {
// Note: we allow to delete non-existent users
let user_cfg = pbs_config::user::cached_config()?;
if user_cfg.sections.get(&auth_id.to_string()).is_none() {
if !user_cfg.sections.contains_key(&auth_id.to_string()) {
bail!(format!(
"no such {}.",
if auth_id.is_token() {

4
src/api2/tape/drive.rs
View File

@ -495,7 +495,7 @@ pub fn label_media(
if let Some(ref pool) = pool {
let (pool_config, _digest) = pbs_config::media_pool::config()?;
if pool_config.sections.get(pool).is_none() {
if !pool_config.sections.contains_key(pool) {
bail!("no such pool ('{}')", pool);
}
}
@ -1056,7 +1056,7 @@ pub fn barcode_label_media(
if let Some(ref pool) = pool {
let (pool_config, _digest) = pbs_config::media_pool::config()?;
if pool_config.sections.get(pool).is_none() {
if !pool_config.sections.contains_key(pool) {
bail!("no such pool ('{}')", pool);
}
}

2
src/config/acme/plugin.rs
View File

@ -147,7 +147,7 @@ pub fn config() -> Result<(PluginData, [u8; 32]), Error> {
let digest = openssl::sha::sha256(content.as_bytes());
let mut data = CONFIG.parse(ACME_PLUGIN_CFG_FILENAME, &content)?;
if data.sections.get("standalone").is_none() {
if !data.sections.contains_key("standalone") {
let standalone = StandalonePlugin::default();
data.set_data("standalone", "standalone", &standalone)
.unwrap();