mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-12-02 06:21:06 +00:00
Code Issues Projects Releases Wiki Activity

gstreamer/datetime_serde: Use glib::BoolError instead of a &'static str as TryFrom error type

Browse source
This commit is contained in:
Sebastian Dröge 2020-05-26 18:54:06 +03:00
parent 5eb1dbd93e
commit dfdf01b868
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gstreamer/src/date_time_serde.rs
View file

@ -107,7 +107,7 @@ impl<'a> Serialize for DateTime {
} }
impl TryFrom<DateTimeVariants> for Date { impl TryFrom<DateTimeVariants> for Date {
type Error = &'static str; type Error = glib::BoolError;
fn try_from(dt_variant: DateTimeVariants) -> Result<Self, Self::Error> { fn try_from(dt_variant: DateTimeVariants) -> Result<Self, Self::Error> {
skip_assert_initialized!(); skip_assert_initialized!();
@ -115,16 +115,20 @@ impl TryFrom<DateTimeVariants> for Date {
DateTimeVariants::YMD(y, m, d) => { DateTimeVariants::YMD(y, m, d) => {
let month = glib::DateMonth::from_glib(m); let month = glib::DateMonth::from_glib(m);
if let glib::DateMonth::__Unknown(_) = month { 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( 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, 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\")"
)),
} }
} }
} }