diff --git a/proxmox-time/src/test.rs b/proxmox-time/src/test.rs index 0476cc1c..ec63a371 100644 --- a/proxmox-time/src/test.rs +++ b/proxmox-time/src/test.rs @@ -225,7 +225,7 @@ fn test_calendar_event_weekday() -> Result<(), Error> { #[test] fn test_time_span_parser() -> Result<(), Error> { let test_value = |ts_str: &str, expect: f64| -> Result<(), Error> { - let ts = parse_time_span(ts_str)?; + let ts: TimeSpan = ts_str.parse()?; assert_eq!(f64::from(ts), expect, "{}", ts_str); Ok(()) }; diff --git a/proxmox-time/src/time_span.rs b/proxmox-time/src/time_span.rs index 2f8cf59c..0a6c9cad 100644 --- a/proxmox-time/src/time_span.rs +++ b/proxmox-time/src/time_span.rs @@ -198,9 +198,18 @@ fn parse_time_unit(i: &str) -> IResult<&str, &str> { } } +impl std::str::FromStr for TimeSpan { + type Err = Error; + + fn from_str(i: &str) -> Result { + parse_complete_line("calendar event", i, parse_time_span_incomplete) + } +} + /// Parse a [TimeSpan] +#[deprecated="Use std::str::FromStr trait instead."] pub fn parse_time_span(i: &str) -> Result { - parse_complete_line("time span", i, parse_time_span_incomplete) + i.parse() } fn parse_time_span_incomplete(mut i: &str) -> IResult<&str, TimeSpan> { @@ -259,7 +268,7 @@ fn parse_time_span_incomplete(mut i: &str) -> IResult<&str, TimeSpan> { /// Verify the format of the [TimeSpan] pub fn verify_time_span(i: &str) -> Result<(), Error> { - parse_time_span(i)?; + let _: TimeSpan = i.parse()?; Ok(()) }