From 946d95cfcd17c8d291daf6781124d9692f0e8577 Mon Sep 17 00:00:00 2001 From: Shannon Sterz Date: Thu, 6 Mar 2025 13:43:36 +0100 Subject: [PATCH] access-control/tfa: use `?` instead of unnecessary match statements this makes the code more concise and legible. fixes a clippy lint [1]. [1]: https://rust-lang.github.io/rust-clippy/master/index.html#question_mark Signed-off-by: Shannon Sterz --- proxmox-access-control/src/acl.rs | 10 ++-------- proxmox-tfa/src/api/methods.rs | 5 +---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/proxmox-access-control/src/acl.rs b/proxmox-access-control/src/acl.rs index 1964abe2..5a676d3d 100644 --- a/proxmox-access-control/src/acl.rs +++ b/proxmox-access-control/src/acl.rs @@ -208,10 +208,7 @@ impl AclTree { let mut node = &self.root; for outer in path { for comp in outer.split('/') { - node = match node.children.get(comp) { - Some(n) => n, - None => return None, - }; + node = node.children.get(comp)?; } } Some(node) @@ -221,10 +218,7 @@ impl AclTree { let mut node = &mut self.root; for outer in path { for comp in outer.split('/') { - node = match node.children.get_mut(comp) { - Some(n) => n, - None => return None, - }; + node = node.children.get_mut(comp)?; } } Some(node) diff --git a/proxmox-tfa/src/api/methods.rs b/proxmox-tfa/src/api/methods.rs index 3c6dac40..a165400a 100644 --- a/proxmox-tfa/src/api/methods.rs +++ b/proxmox-tfa/src/api/methods.rs @@ -98,10 +98,7 @@ pub fn list_user_tfa(config: &TfaConfig, userid: &str) -> Result Option { - let user_data = match config.users.get(userid) { - Some(u) => u, - None => return None, - }; + let user_data = config.users.get(userid)?; Some({ let res = {