From 57652c2776915bff2c099cf01125713cf8b8fa8a Mon Sep 17 00:00:00 2001 From: Akulij Date: Mon, 2 Jun 2025 12:02:28 +0500 Subject: [PATCH] fix: infinite try_from deserealization --- src/botscript.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/botscript.rs b/src/botscript.rs index 1189b75..9efde21 100644 --- a/src/botscript.rs +++ b/src/botscript.rs @@ -625,8 +625,8 @@ impl SpecificTime { #[derive(Serialize, Deserialize, Debug, Clone)] #[serde(untagged)] pub enum SpecificTimeFormat { - Verbose(SpecificTime), String(String), + Verbose { hour: u8, minutes: u8 }, } impl TryFrom for SpecificTime { @@ -634,11 +634,11 @@ impl TryFrom for SpecificTime { fn try_from(stf: SpecificTimeFormat) -> Result { match stf { - SpecificTimeFormat::Verbose(specific_time) => Ok(specific_time), + SpecificTimeFormat::Verbose { hour, minutes } => Ok(Self::new(hour, minutes)), SpecificTimeFormat::String(timestring) => { let time: NaiveTime = timestring.parse()?; - Ok(SpecificTime::new(time.hour() as u8, time.minute() as u8)) + Ok(Self::new(time.hour() as u8, time.minute() as u8)) } } }