manager: Clean up Result<_, zbus::fdo::Error> into zbus::fdo::Result<_>

This commit is contained in:
Vicki Pfau 2024-03-29 16:38:08 -07:00
parent 86515aceaf
commit 9ec6fc8852

View file

@ -176,7 +176,7 @@ impl SteamOSManager {
} }
} }
async fn get_als_integration_time_file_descriptor(&self) -> Result<Fd, zbus::fdo::Error> { async fn get_als_integration_time_file_descriptor(&self) -> zbus::fdo::Result<Fd> {
// Get the file descriptor for the als integration time sysfs path // Get the file descriptor for the als integration time sysfs path
let result = File::create(ALS_INTEGRATION_PATH).await; let result = File::create(ALS_INTEGRATION_PATH).await;
match result { match result {
@ -188,7 +188,7 @@ impl SteamOSManager {
} }
} }
async fn update_bios(&self) -> Result<(), zbus::fdo::Error> { async fn update_bios(&self) -> zbus::fdo::Result<()> {
// Update the bios as needed // Update the bios as needed
run_script( run_script(
"update bios", "update bios",
@ -199,7 +199,7 @@ impl SteamOSManager {
.map_err(anyhow_to_zbus_fdo) .map_err(anyhow_to_zbus_fdo)
} }
async fn update_dock(&self) -> Result<(), zbus::fdo::Error> { async fn update_dock(&self) -> zbus::fdo::Result<()> {
// Update the dock firmware as needed // Update the dock firmware as needed
run_script( run_script(
"update dock firmware", "update dock firmware",
@ -210,7 +210,7 @@ impl SteamOSManager {
.map_err(anyhow_to_zbus_fdo) .map_err(anyhow_to_zbus_fdo)
} }
async fn trim_devices(&self) -> Result<(), zbus::fdo::Error> { async fn trim_devices(&self) -> zbus::fdo::Result<()> {
// Run steamos-trim-devices script // Run steamos-trim-devices script
run_script( run_script(
"trim devices", "trim devices",
@ -226,7 +226,7 @@ impl SteamOSManager {
device: &str, device: &str,
label: &str, label: &str,
validate: bool, validate: bool,
) -> Result<(), zbus::fdo::Error> { ) -> zbus::fdo::Result<()> {
let mut args = vec!["--label", label, "--device", device]; let mut args = vec!["--label", label, "--device", device];
if !validate { if !validate {
args.push("--skip-validation"); args.push("--skip-validation");
@ -302,11 +302,7 @@ impl SteamOSManager {
} }
} }
async fn set_wifi_debug_mode( async fn set_wifi_debug_mode(&mut self, mode: u32, buffer_size: u32) -> zbus::fdo::Result<()> {
&mut self,
mode: u32,
buffer_size: u32,
) -> Result<(), zbus::fdo::Error> {
// Set the wifi debug mode to mode, using an int for flexibility going forward but only // Set the wifi debug mode to mode, using an int for flexibility going forward but only
// doing things on 0 or 1 for now // doing things on 0 or 1 for now
// Return false on error // Return false on error