From dfdf01b86829dd20afbdc436ee7cfa666d37dcca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 26 May 2020 18:54:06 +0300 Subject: [PATCH] gstreamer/datetime_serde: Use glib::BoolError instead of a &'static str as TryFrom error type --- gstreamer/src/date_time_serde.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gstreamer/src/date_time_serde.rs b/gstreamer/src/date_time_serde.rs index 5b8c98860..ca6a37dc1 100644 --- a/gstreamer/src/date_time_serde.rs +++ b/gstreamer/src/date_time_serde.rs @@ -107,7 +107,7 @@ impl<'a> Serialize for DateTime { } impl TryFrom for Date { - type Error = &'static str; + type Error = glib::BoolError; fn try_from(dt_variant: DateTimeVariants) -> Result { skip_assert_initialized!(); @@ -115,16 +115,20 @@ impl TryFrom for Date { DateTimeVariants::YMD(y, m, d) => { let month = glib::DateMonth::from_glib(m); if let glib::DateMonth::__Unknown(_) = month { - return Err("Out of range `month` for `Date`"); + return Err(glib_bool_error!("Out of range `month` for `Date`")); } Ok(Date(glib::Date::new_dmy( - d.try_into().map_err(|_| "Out of range `day` for `Date`")?, + d.try_into() + .map_err(|_| glib_bool_error!("Out of range `day` for `Date`"))?, month, - y.try_into().map_err(|_| "Out of range `year` for `Date`")?, + y.try_into() + .map_err(|_| glib_bool_error!("Out of range `year` for `Date`"))?, ))) } - _ => Err("Incompatible variant for `Date` (expecting \"YMD\")"), + _ => Err(glib_bool_error!( + "Incompatible variant for `Date` (expecting \"YMD\")" + )), } } }