From 93e6a9a08aec3cbb8b847a815ad905aa0d0bffca Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 26 Mar 2023 00:10:35 -0400 Subject: fmt --- src/power/mod.rs | 17 ++++++----------- src/power/sys/linux.rs | 7 ++++--- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'src/power') diff --git a/src/power/mod.rs b/src/power/mod.rs index afe5194..fb75499 100644 --- a/src/power/mod.rs +++ b/src/power/mod.rs @@ -15,9 +15,7 @@ impl PowerInfo { pub fn new() -> PowerInfo { let power_supplies = sys::power_supplies(); - PowerInfo { - power_supplies, - } + PowerInfo { power_supplies } } pub fn battery_usage(&self) -> Option { @@ -26,22 +24,19 @@ impl PowerInfo { for battery in self.batteries() { if let Some(now) = battery.energy_now { total_now += now; - } - else { + } else { return None; } if let Some(full) = battery.energy_full { total_full += full; - } - else { + } else { return None; } } if total_full > 0 { Some((total_now as f64) / (total_full as f64)) - } - else { + } else { None } } @@ -59,13 +54,13 @@ impl PowerInfo { self.batteries().count() > 0 } - fn batteries(&self) -> impl Iterator { + fn batteries(&self) -> impl Iterator { self.power_supplies .iter() .filter(|p| p.ty == sys::PowerSupplyType::Battery) } - fn mains(&self) -> impl Iterator { + fn mains(&self) -> impl Iterator { self.power_supplies .iter() .filter(|p| p.ty == sys::PowerSupplyType::AC) diff --git a/src/power/sys/linux.rs b/src/power/sys/linux.rs index 9b4bcc4..90115a2 100644 --- a/src/power/sys/linux.rs +++ b/src/power/sys/linux.rs @@ -18,10 +18,11 @@ pub fn power_supplies() -> Vec { let ty = super::super::slurp(entry.path().join("type")) .map(|t: String| super::PowerSupplyType::from_str(&t)) .expect("couldn't find power supply type"); - let energy_full = super::super::slurp(entry.path().join("energy_full")); + let energy_full = + super::super::slurp(entry.path().join("energy_full")); let energy_now = super::super::slurp(entry.path().join("energy_now")); - let online = - super::super::slurp(entry.path().join("online")).map(|n: u8| n != 0); + let online = super::super::slurp(entry.path().join("online")) + .map(|n: u8| n != 0); power_supplies.push(super::PowerSupplyInfo { name, -- cgit v1.2.3-54-g00ecf