diff --git a/src/codec.rs b/src/codec.rs index 3660680..bea952f 100644 --- a/src/codec.rs +++ b/src/codec.rs @@ -143,7 +143,7 @@ mod tests { }; range_param!(RangeParam(0..=15): u8); - range_response!(RangeParam => ParamError : Invalid("invalid")); + range_response!(RangeParam => ParamError::Invalid("invalid")); command!(b"CMD": SimpleCommand); command!(b"CMD": ResponseCommand => RangeParam); diff --git a/src/command/bc125at/battery_charge_time.rs b/src/command/bc125at/battery_charge_time.rs index 2d87bed..ada0d07 100644 --- a/src/command/bc125at/battery_charge_time.rs +++ b/src/command/bc125at/battery_charge_time.rs @@ -1,7 +1,7 @@ use crate::command::{OkResponse, command, range_param, range_response}; range_param!(BatteryChargeTime(1..=16): u8); -range_response!(BatteryChargeTime => BatteryChargeTimeError : InvalidBatteryChargeTime("volume must be between [1..16], got `{0}`")); +range_response!(BatteryChargeTime => BatteryChargeTimeError::InvalidBatteryChargeTime("volume must be between [1..16], got `{0}`")); command!(b"BSV": GetBatteryInfo => BatteryChargeTime); command!(b"BSV": SetBatteryInfo(BatteryChargeTime) => OkResponse); diff --git a/src/command/bc125at/lcd_contrast.rs b/src/command/bc125at/lcd_contrast.rs index f40a74e..a1044de 100644 --- a/src/command/bc125at/lcd_contrast.rs +++ b/src/command/bc125at/lcd_contrast.rs @@ -1,7 +1,7 @@ use crate::command::{OkResponse, command, range_param, range_response}; range_param!(LcdContrast(0..=15): u8); -range_response!(LcdContrast => LcdContrastError : InvalidLcdContrast("LCD contrast must be between [1..15], got `{0}`")); +range_response!(LcdContrast => LcdContrastError::InvalidLcdContrast("LCD contrast must be between [1..15], got `{0}`")); command!(b"CNT": GetLcdContrast => LcdContrast); command!(b"CNT": SetLcdContrast(LcdContrast) => OkResponse); diff --git a/src/command/bc125at/squelch.rs b/src/command/bc125at/squelch.rs index 5b02d80..b77dd99 100644 --- a/src/command/bc125at/squelch.rs +++ b/src/command/bc125at/squelch.rs @@ -1,7 +1,7 @@ use crate::command::{OkResponse, command, range_param, range_response}; range_param!(SquelchLevel(0..=15): u8); -range_response!(SquelchLevel => SquelchLevelError : InvalidSquelch("squelch must be between [0..15], got `{0}`")); +range_response!(SquelchLevel => SquelchLevelError::InvalidSquelch("squelch must be between [0..15], got `{0}`")); command!(b"SQL": GetSquelchLevel => SquelchLevel); command!(b"SQL": SetSquelchLevel(SquelchLevel) => OkResponse); diff --git a/src/command/bc125at/volume.rs b/src/command/bc125at/volume.rs index b9be9e9..f414a21 100644 --- a/src/command/bc125at/volume.rs +++ b/src/command/bc125at/volume.rs @@ -1,7 +1,7 @@ use crate::command::{OkResponse, command, range_param, range_response}; range_param!(VolumeLevel(0..=15): u8); -range_response!(VolumeLevel => VolumeLevelError : InvalidVolume("volume must be between [0..15], got `{0}`")); +range_response!(VolumeLevel => VolumeLevelError::InvalidVolume("volume must be between [0..15], got `{0}`")); command!(b"VOL": GetVolumeLevel => VolumeLevel); command!(b"VOL": SetVolumeLevel(VolumeLevel) => OkResponse); diff --git a/src/command/macros/command.rs b/src/command/macros/command.rs index 06163cd..9fc27f8 100644 --- a/src/command/macros/command.rs +++ b/src/command/macros/command.rs @@ -52,7 +52,7 @@ mod tests { }; range_param!(RangeParam(0..=15): u8); - range_response!(RangeParam => ParamError : Invalid("invalid")); + range_response!(RangeParam => ParamError::Invalid("invalid")); #[test] fn no_params_ok_response() { diff --git a/src/command/macros/range_response.rs b/src/command/macros/range_response.rs index 5016410..dc794fb 100644 --- a/src/command/macros/range_response.rs +++ b/src/command/macros/range_response.rs @@ -1,5 +1,5 @@ macro_rules! range_response { - ($name:ty => $error:ident : $invalid_variant:ident($msg:literal)) => { + ($name:ty => $error:ident::$invalid_variant:ident($msg:literal)) => { #[derive(::core::fmt::Debug, ::thiserror::Error)] pub enum $error { #[error(transparent)] @@ -35,7 +35,7 @@ mod tests { use crate::command::{Response, range_param, test::deserialize}; range_param!(U8RangeParam(0..=10): u8); - range_response!(U8RangeParam => ParamError : Invalid("invalid")); + range_response!(U8RangeParam => ParamError::Invalid("invalid")); #[test] fn expected_field_count() {