github-mirror/rwmstatus
1
0
Fork 0
mirror of https://github.com/Wojtek242/rwmstatus.git synced 2024-11-21 23:25:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't use internal Result type

Browse Source
This commit is contained in:
Wojciech Kozlowski 2018-12-31 12:33:38 +08:00
parent ad6720f11c
commit bd8df56616
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib.rs
View File

@ -21,13 +21,13 @@ use std::path::{Path, PathBuf};
use chrono::prelude::*; use chrono::prelude::*;
/// Return temperature read from the provided monitor. /// Return temperature read from the provided monitor.
pub fn get_temp(hwmon: &PathBuf) -> Result<String> { pub fn get_temp(hwmon: &PathBuf) -> Result<String, StatusError> {
let val: i64 = read_to_string(hwmon.join("temp1_input"))?.trim().parse()?; let val: i64 = read_to_string(hwmon.join("temp1_input"))?.trim().parse()?;
Ok(format!("{:02}°C", val / 1000)) Ok(format!("{:02}°C", val / 1000))
} }
/// Return the three load average values. /// Return the three load average values.
pub fn get_load_avgs() -> Result<String> { pub fn get_load_avgs() -> Result<String, StatusError> {
let mut avgs: [libc::c_double; 3] = [0.0; 3]; let mut avgs: [libc::c_double; 3] = [0.0; 3];
let rc = unsafe { libc::getloadavg(&mut avgs[0] as *mut libc::c_double, 3) }; let rc = unsafe { libc::getloadavg(&mut avgs[0] as *mut libc::c_double, 3) };
@ -39,7 +39,7 @@ pub fn get_load_avgs() -> Result<String> {
} }
/// Return battery status for the battery at the provided path. /// Return battery status for the battery at the provided path.
pub fn get_batt(batt: &PathBuf) -> Result<String> { pub fn get_batt(batt: &PathBuf) -> Result<String, StatusError> {
if !read_to_string(batt.join("present"))?.starts_with('1') { if !read_to_string(batt.join("present"))?.starts_with('1') {
return Err(StatusError::NotPresent(batt.to_str().unwrap().to_string())); return Err(StatusError::NotPresent(batt.to_str().unwrap().to_string()));
} }
@ -71,7 +71,7 @@ pub fn get_batt(batt: &PathBuf) -> Result<String> {
} }
/// Get the time for the provided time zone. /// Get the time for the provided time zone.
pub fn get_tz_time(tz_name: &str, fmt: &str) -> Result<String> { pub fn get_tz_time(tz_name: &str, fmt: &str) -> Result<String, StatusError> {
let tz: chrono_tz::Tz = tz_name.parse().map_err(StatusError::ParseTz)?; let tz: chrono_tz::Tz = tz_name.parse().map_err(StatusError::ParseTz)?;
let utc = Utc::now().naive_utc(); let utc = Utc::now().naive_utc();
Ok(format!("{}", tz.from_utc_datetime(&utc).format(fmt))) Ok(format!("{}", tz.from_utc_datetime(&utc).format(fmt)))
@ -195,9 +195,6 @@ impl RwmStatus {
} }
} }
/// Internal `Result` type.
type Result<T> = std::result::Result<T, StatusError>;
/// Error type for `rwmstatus` functions. /// Error type for `rwmstatus` functions.
#[derive(Debug)] #[derive(Debug)]
pub enum StatusError { pub enum StatusError {