Fix enum errors containing {v} instead of value

This commit is contained in:
Vicki Pfau 2024-08-08 20:10:40 -07:00
parent 0871125e3e
commit 674c693180
3 changed files with 12 additions and 12 deletions

View file

@ -21,13 +21,13 @@ pub enum HdmiCecState {
} }
impl TryFrom<u32> for HdmiCecState { impl TryFrom<u32> for HdmiCecState {
type Error = &'static str; type Error = String;
fn try_from(v: u32) -> Result<Self, Self::Error> { fn try_from(v: u32) -> Result<Self, Self::Error> {
match v { match v {
x if x == HdmiCecState::Disabled as u32 => Ok(HdmiCecState::Disabled), x if x == HdmiCecState::Disabled as u32 => Ok(HdmiCecState::Disabled),
x if x == HdmiCecState::ControlOnly as u32 => Ok(HdmiCecState::ControlOnly), x if x == HdmiCecState::ControlOnly as u32 => Ok(HdmiCecState::ControlOnly),
x if x == HdmiCecState::ControlAndWake as u32 => Ok(HdmiCecState::ControlAndWake), 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}")),
} }
} }
} }

View file

@ -52,7 +52,7 @@ impl FromStr for HardwareVariant {
} }
impl TryFrom<u32> for HardwareCurrentlySupported { impl TryFrom<u32> for HardwareCurrentlySupported {
type Error = &'static str; type Error = String;
fn try_from(v: u32) -> Result<Self, Self::Error> { fn try_from(v: u32) -> Result<Self, Self::Error> {
match v { match v {
x if x == HardwareCurrentlySupported::Unknown as u32 => { x if x == HardwareCurrentlySupported::Unknown as u32 => {
@ -64,7 +64,7 @@ impl TryFrom<u32> for HardwareCurrentlySupported {
x if x == HardwareCurrentlySupported::Supported as u32 => { x if x == HardwareCurrentlySupported::Supported as u32 => {
Ok(HardwareCurrentlySupported::Supported) 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<u32> for FanControlState { impl TryFrom<u32> for FanControlState {
type Error = &'static str; type Error = String;
fn try_from(v: u32) -> Result<Self, Self::Error> { fn try_from(v: u32) -> Result<Self, Self::Error> {
match v { match v {
x if x == FanControlState::Bios as u32 => Ok(FanControlState::Bios), x if x == FanControlState::Bios as u32 => Ok(FanControlState::Bios),
x if x == FanControlState::Os as u32 => Ok(FanControlState::Os), 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}")),
} }
} }
} }

View file

@ -75,34 +75,34 @@ pub enum WifiBackend {
} }
impl TryFrom<u32> for WifiDebugMode { impl TryFrom<u32> for WifiDebugMode {
type Error = &'static str; type Error = String;
fn try_from(v: u32) -> Result<Self, Self::Error> { fn try_from(v: u32) -> Result<Self, Self::Error> {
match v { match v {
x if x == WifiDebugMode::Off as u32 => Ok(WifiDebugMode::Off), x if x == WifiDebugMode::Off as u32 => Ok(WifiDebugMode::Off),
x if x == WifiDebugMode::Tracing as u32 => Ok(WifiDebugMode::Tracing), 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<u32> for WifiPowerManagement { impl TryFrom<u32> for WifiPowerManagement {
type Error = &'static str; type Error = String;
fn try_from(v: u32) -> Result<Self, Self::Error> { fn try_from(v: u32) -> Result<Self, Self::Error> {
match v { match v {
x if x == WifiPowerManagement::Disabled as u32 => Ok(WifiPowerManagement::Disabled), x if x == WifiPowerManagement::Disabled as u32 => Ok(WifiPowerManagement::Disabled),
x if x == WifiPowerManagement::Enabled as u32 => Ok(WifiPowerManagement::Enabled), 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<u32> for WifiBackend { impl TryFrom<u32> for WifiBackend {
type Error = &'static str; type Error = String;
fn try_from(v: u32) -> Result<Self, Self::Error> { fn try_from(v: u32) -> Result<Self, Self::Error> {
match v { match v {
x if x == WifiBackend::Iwd as u32 => Ok(WifiBackend::Iwd), x if x == WifiBackend::Iwd as u32 => Ok(WifiBackend::Iwd),
x if x == WifiBackend::WPASupplicant as u32 => Ok(WifiBackend::WPASupplicant), 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}")),
} }
} }
} }