proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-17 08:24:09 +00:00
Code Issues Actions Packages 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 4d8bd987a4
commit 655ceac1c6
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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 { } else if is_counter && value < 0.0 {
if self.flags.contains(RRAFlags::DST_COUNTER) { // check for overflow
if value < 0.0 {
eprintln!("rrdb update failed - got negative value for counter"); eprintln!("rrdb update failed - got negative value for counter");
return; return;
} } else if is_counter && value < self.counter_value {
// Note: We do not try automatic overflow corrections // Note: We do not try automatic overflow corrections
if value < self.counter_value { // overflow or counter reset
self.counter_value = value; self.counter_value = value;
eprintln!("rrdb update failed - conter overflow/reset detected"); eprintln!("rrdb update failed - conter overflow/reset detected");
return; return;
} else { } else {
value - self.counter_value 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;