From 3c15ae513cc800990c5a002d3554fd53b11fe4fd Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 27 Feb 2018 00:58:20 -0500 Subject: simplify --- src/power.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/power.rs') diff --git a/src/power.rs b/src/power.rs index 4bc5c0b..f5ab307 100644 --- a/src/power.rs +++ b/src/power.rs @@ -44,22 +44,22 @@ impl PowerInfo { let ty = slurp(entry.path().join("type")) .map(|t: String| PowerSupplyType::from_str(&t)) .expect("couldn't find power supply type"); - let full = slurp(entry.path().join("energy_full")); - let now = slurp(entry.path().join("energy_now")); + let energy_full = slurp(entry.path().join("energy_full")); + let energy_now = slurp(entry.path().join("energy_now")); let online = slurp(entry.path().join("online")).map(|n: u8| n != 0); power_supplies.push(PowerSupplyInfo { - name: name, - ty: ty, - energy_now: now, - energy_full: full, - online: online, + name, + ty, + energy_now, + energy_full, + online, }) } PowerInfo { - power_supplies: power_supplies, + power_supplies, } } -- cgit v1.2.3-54-g00ecf