gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove many unwraps or change to maps

Browse Source
This commit is contained in:
Luke D Jones
2020-09-23 20:47:33 +12:00
parent 67ad38a7e6
commit a7419cbc4c
13 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ctrl-gfx/src/ctrl_gfx.rs
View File

@@ -37,15 +37,11 @@ use std::convert::TryInto;
#[dbus_interface(name = "org.asuslinux.Daemon")]
impl Dbus for CtrlGraphics {
fn vendor(&self) -> String {
Self::get_vendor()
.map_err(|err| format!("Get vendor failed: {}", err))
.unwrap()
Self::get_vendor().unwrap_or_else(|err| format!("Get vendor failed: {}", err))
}
fn power(&self) -> String {
Self::get_runtime_status()
.map_err(|err| format!("Get power status failed: {}", err))
.unwrap()
Self::get_runtime_status().unwrap_or_else(|err| format!("Get power status failed: {}", err))
}
fn set_vendor(&mut self, vendor: String) {
@@ -149,7 +145,11 @@ impl CtrlGraphics {
pub fn add_to_server(self, server: &mut zbus::ObjectServer) {
server
.at(&"/org/asuslinux/Gfx".try_into().unwrap(), self)
.unwrap();
.map_err(|err| {
warn!("CtrlGraphics: add_to_server {}", err);
err
})
.ok();
}
pub fn reload(&mut self) -> Result<(), Box<dyn Error>> {
@@ -328,8 +328,7 @@ impl CtrlGraphics {
// }
pub fn get_runtime_status() -> Result<String, GfxError> {
const PATH: &str = "/sys/bus/pci/devices/0000:01:00.0/power/runtime_status";
let buf = std::fs::read_to_string(PATH)
.map_err(|err| GfxError::Read(PATH.into(), err))?;
let buf = std::fs::read_to_string(PATH).map_err(|err| GfxError::Read(PATH.into(), err))?;
Ok(buf)
}

2
ctrl-gfx/src/system.rs
View File

@@ -121,7 +121,7 @@ impl GraphicsDevice {
warn!("{}: Already removed", func.id());
}
}
info!("Remmoved all gfx devices");
info!("Removed all gfx devices");
Ok(())
}
}