From 861a986567310dfe9ccd85d2976b0ebfb683c818 Mon Sep 17 00:00:00 2001 From: AdaShoelace Date: Thu, 21 Jan 2021 22:24:15 +0100 Subject: Change to serde Change config serializer to serde in order to get cleaner config types. --- src/utils/battery.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/utils/battery.rs') diff --git a/src/utils/battery.rs b/src/utils/battery.rs index a38d3b4..1278303 100644 --- a/src/utils/battery.rs +++ b/src/utils/battery.rs @@ -1,17 +1,17 @@ -use crate::types::Config; +use crate::config::CONFIG; use std::fs::File; use std::io::Error; use std::io::Read; // getting battery percentage -pub fn get_battery(config: &Config) -> Result { +pub fn get_battery() -> Result { let battery_full_cap_file = format!( "/sys/class/power_supply/{}/charge_full_design", - config.battery.source + CONFIG.battery.source ); let battery_charge_now_file = format!( "/sys/class/power_supply/{}/charge_now", - config.battery.source + CONFIG.battery.source ); let mut buf = String::new(); @@ -31,7 +31,7 @@ pub fn get_battery(config: &Config) -> Result { let battery_percentage = (charge_now as f32 / full_design as f32) * 100.0; let result = format!( " {} {:.0}% {}", - config.battery.icon, battery_percentage, config.seperator + CONFIG.battery.icon, battery_percentage, CONFIG.seperator ); Ok(result) } -- cgit v1.2.3