diff options
Diffstat (limited to 'src/app/data_harvester/batteries.rs')
| -rw-r--r-- | src/app/data_harvester/batteries.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/app/data_harvester/batteries.rs b/src/app/data_harvester/batteries.rs index 66e3c76b..98cf6ae6 100644 --- a/src/app/data_harvester/batteries.rs +++ b/src/app/data_harvester/batteries.rs @@ -20,19 +20,11 @@ pub fn refresh_batteries(manager: &Manager, batteries: &mut [Battery]) -> Vec<Ba Some(BatteryHarvest { secs_until_full: { let optional_time = battery.time_to_full(); - if let Some(time) = optional_time { - Some(f64::from(time.get::<second>()) as i64) - } else { - None - } + optional_time.map(|time| f64::from(time.get::<second>()) as i64) }, secs_until_empty: { let optional_time = battery.time_to_empty(); - if let Some(time) = optional_time { - Some(f64::from(time.get::<second>()) as i64) - } else { - None - } + optional_time.map(|time| f64::from(time.get::<second>()) as i64) }, charge_percent: f64::from(battery.state_of_charge().get::<percent>()), power_consumption_rate_watts: f64::from(battery.energy_rate().get::<watt>()), |