From 674c69318008945effcd9a3c45150ed07927c5f6 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Thu, 8 Aug 2024 20:10:40 -0700 Subject: [PATCH] Fix enum errors containing {v} instead of value --- src/cec.rs | 4 ++-- src/hardware.rs | 8 ++++---- src/wifi.rs | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/cec.rs b/src/cec.rs index 84b2635..2f3191e 100644 --- a/src/cec.rs +++ b/src/cec.rs @@ -21,13 +21,13 @@ pub enum HdmiCecState { } impl TryFrom for HdmiCecState { - type Error = &'static str; + type Error = String; fn try_from(v: u32) -> Result { match v { x if x == HdmiCecState::Disabled as u32 => Ok(HdmiCecState::Disabled), x if x == HdmiCecState::ControlOnly as u32 => Ok(HdmiCecState::ControlOnly), x if x == HdmiCecState::ControlAndWake as u32 => Ok(HdmiCecState::ControlAndWake), - _ => Err("No enum match for value {v}"), + _ => Err(format!("No enum match for value {v}")), } } } diff --git a/src/hardware.rs b/src/hardware.rs index 8f6cbf7..7baf308 100644 --- a/src/hardware.rs +++ b/src/hardware.rs @@ -52,7 +52,7 @@ impl FromStr for HardwareVariant { } impl TryFrom for HardwareCurrentlySupported { - type Error = &'static str; + type Error = String; fn try_from(v: u32) -> Result { match v { x if x == HardwareCurrentlySupported::Unknown as u32 => { @@ -64,7 +64,7 @@ impl TryFrom for HardwareCurrentlySupported { x if x == HardwareCurrentlySupported::Supported as u32 => { Ok(HardwareCurrentlySupported::Supported) } - _ => Err("No enum match for value {v}"), + _ => Err(format!("No enum match for value {v}")), } } } @@ -80,12 +80,12 @@ impl fmt::Display for HardwareCurrentlySupported { } impl TryFrom for FanControlState { - type Error = &'static str; + type Error = String; fn try_from(v: u32) -> Result { match v { x if x == FanControlState::Bios as u32 => Ok(FanControlState::Bios), x if x == FanControlState::Os as u32 => Ok(FanControlState::Os), - _ => Err("No enum match for value {v}"), + _ => Err(format!("No enum match for value {v}")), } } } diff --git a/src/wifi.rs b/src/wifi.rs index a622209..d0ea42b 100644 --- a/src/wifi.rs +++ b/src/wifi.rs @@ -75,34 +75,34 @@ pub enum WifiBackend { } impl TryFrom for WifiDebugMode { - type Error = &'static str; + type Error = String; fn try_from(v: u32) -> Result { match v { x if x == WifiDebugMode::Off as u32 => Ok(WifiDebugMode::Off), x if x == WifiDebugMode::Tracing as u32 => Ok(WifiDebugMode::Tracing), - _ => Err("No enum match for value {v}"), + _ => Err(format!("No enum match for value {v}")), } } } impl TryFrom for WifiPowerManagement { - type Error = &'static str; + type Error = String; fn try_from(v: u32) -> Result { match v { x if x == WifiPowerManagement::Disabled as u32 => Ok(WifiPowerManagement::Disabled), x if x == WifiPowerManagement::Enabled as u32 => Ok(WifiPowerManagement::Enabled), - _ => Err("No enum match for value {v}"), + _ => Err(format!("No enum match for value {v}")), } } } impl TryFrom for WifiBackend { - type Error = &'static str; + type Error = String; fn try_from(v: u32) -> Result { match v { x if x == WifiBackend::Iwd as u32 => Ok(WifiBackend::Iwd), x if x == WifiBackend::WPASupplicant as u32 => Ok(WifiBackend::WPASupplicant), - _ => Err("No enum match for WifiBackend value {v}"), + _ => Err(format!("No enum match for WifiBackend value {v}")), } } }