mirror of
https://git.proxmox.com/git/proxmox-backup
synced 2025-10-04 18:48:10 +00:00
replace match statements with ? operator
When possible. Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
This commit is contained in:
parent
c4c050dc36
commit
f1a5808e67
@ -342,10 +342,7 @@ impl AclTree {
|
|||||||
let mut node = &self.root;
|
let mut node = &self.root;
|
||||||
for outer in path {
|
for outer in path {
|
||||||
for comp in outer.split('/') {
|
for comp in outer.split('/') {
|
||||||
node = match node.children.get(comp) {
|
node = node.children.get(comp)?;
|
||||||
Some(n) => n,
|
|
||||||
None => return None,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(node)
|
Some(node)
|
||||||
@ -355,10 +352,7 @@ impl AclTree {
|
|||||||
let mut node = &mut self.root;
|
let mut node = &mut self.root;
|
||||||
for outer in path {
|
for outer in path {
|
||||||
for comp in outer.split('/') {
|
for comp in outer.split('/') {
|
||||||
node = match node.children.get_mut(comp) {
|
node = node.children.get_mut(comp)?;
|
||||||
Some(n) => n,
|
|
||||||
None => return None,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(node)
|
Some(node)
|
||||||
|
@ -417,10 +417,9 @@ impl Iterator for ListNamespacesRecursive {
|
|||||||
if state.is_empty() {
|
if state.is_empty() {
|
||||||
return None; // there's a state but it's empty -> we're all done
|
return None; // there's a state but it's empty -> we're all done
|
||||||
}
|
}
|
||||||
let iter = match state.last_mut() {
|
// should we just unwrap on None?
|
||||||
Some(iter) => iter,
|
let iter = state.last_mut()?;
|
||||||
None => return None, // unexpected, should we just unwrap?
|
|
||||||
};
|
|
||||||
match iter.next() {
|
match iter.next() {
|
||||||
Some(Ok(ns)) => {
|
Some(Ok(ns)) => {
|
||||||
if state.len() < self.max_depth as usize {
|
if state.len() < self.max_depth as usize {
|
||||||
|
Loading…
Reference in New Issue
Block a user