tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clippy: collapse/rework nested ifs

Browse Source 
no semantic changes (intended).

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-01-15 14:10:24 +01:00
parent 0123039271
commit 47ea98e0e3
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api2/access/tfa.rs
View File

@ -331,13 +331,11 @@ fn list_tfa(rpcenv: &mut dyn RpcEnvironment) -> Result<Vec<TfaUser>, Error> {
entries: to_data(data), entries: to_data(data),
}); });
} }
} else { } else if let Some(data) = { tfa_data }.remove(authid.user()) {
if let Some(data) = { tfa_data }.remove(authid.user()) { out.push(TfaUser {
out.push(TfaUser { userid: authid.into(),
userid: authid.into(), entries: to_data(data),
entries: to_data(data), });
});
}
} }
Ok(out) Ok(out)

15
src/config/network/helper.rs
View File

@ -68,15 +68,16 @@ pub fn parse_cidr(cidr: &str) -> Result<(String, u8, bool), Error> {
} }
pub fn check_netmask(mask: u8, is_v6: bool) -> Result<(), Error> { pub fn check_netmask(mask: u8, is_v6: bool) -> Result<(), Error> {
if is_v6 { let (ver, min, max) = if is_v6 {
if !(mask >= 1 && mask <= 128) { ("IPv6", 1, 128)
bail!("IPv6 mask '{}' is out of range (1..128).", mask);
}
} else { } else {
if !(mask > 0 && mask <= 32) { ("IPv4", 1, 32)
bail!("IPv4 mask '{}' is out of range (1..32).", mask); };
}
if !(mask >= min && mask <= max) {
bail!("{} mask '{}' is out of range ({}..{}).", ver, mask, min, max);
} }
Ok(()) Ok(())
} }

27
src/rrd/rrd.rs
View File

@ -128,25 +128,20 @@ impl RRA {
// derive counter value // derive counter value
if self.flags.intersects(RRAFlags::DST_DERIVE | RRAFlags::DST_COUNTER) { if self.flags.intersects(RRAFlags::DST_DERIVE | RRAFlags::DST_COUNTER) {
let time_diff = time - self.last_update; let time_diff = time - self.last_update;
let is_counter = self.flags.contains(RRAFlags::DST_COUNTER);
let diff = if self.counter_value.is_nan() { let diff = if self.counter_value.is_nan() {
0.0 0.0
} else if is_counter && value < 0.0 {
eprintln!("rrdb update failed - got negative value for counter");
return;
} else if is_counter && value < self.counter_value {
// Note: We do not try automatic overflow corrections
self.counter_value = value;
eprintln!("rrdb update failed - conter overflow/reset detected");
return;
} else { } else {
if self.flags.contains(RRAFlags::DST_COUNTER) { // check for overflow value - self.counter_value
if value < 0.0 {
eprintln!("rrdb update failed - got negative value for counter");
return;
}
// Note: We do not try automatic overflow corrections
if value < self.counter_value { // overflow or counter reset
self.counter_value = value;
eprintln!("rrdb update failed - conter overflow/reset detected");
return;
} else {
value - self.counter_value
}
} else {
value - self.counter_value
}
}; };
self.counter_value = value; self.counter_value = value;
value = diff/time_diff; value = diff/time_diff;