From ae8718ed6ade1b9cb72b9debd77b11b96e5f970f Mon Sep 17 00:00:00 2001 From: lkoester Date: Tue, 7 Feb 2023 16:01:25 +0100 Subject: [PATCH] simplified get is switch on --- satrs-core/src/power.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/satrs-core/src/power.rs b/satrs-core/src/power.rs index fa8ee01..513b479 100644 --- a/satrs-core/src/power.rs +++ b/satrs-core/src/power.rs @@ -49,11 +49,8 @@ pub trait PowerSwitcher { /// Retrieve the switch state fn get_switch_state(&mut self, switch_id: SwitchId) -> Result; - fn get_is_switch_on(&mut self, switch_id: SwitchId) -> Result { - match self.get_switch_state(switch_id) { - Ok(switch_state) => { Ok(switch_state == SwitchState::On) } - Err(_) => { Err(()) } - } + fn get_is_switch_on(&mut self, switch_id: SwitchId) -> Result { + Ok(self.get_switch_state(switch_id)? == SwitchState::On) } /// The maximum delay it will take to change a switch.