From 84720eee66ace1e445ae65b46a959fcaf030dc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 5 Jan 2023 18:55:38 +0200 Subject: [PATCH] gstreamer: Use `Value::from_type_unchecked()` where applicable Gets rid of some unnecessary assertions. Part-of: --- gstreamer/src/iterator.rs | 5 +++-- gstreamer/src/serde_macros.rs | 2 +- gstreamer/src/value.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gstreamer/src/iterator.rs b/gstreamer/src/iterator.rs index 23b2f9261..a74b31fbb 100644 --- a/gstreamer/src/iterator.rs +++ b/gstreamer/src/iterator.rs @@ -64,7 +64,8 @@ where { unsafe { let func_box: Box bool + Send + Sync + 'static> = Box::new(func); - let mut closure_value = glib::Value::from_type(from_glib(filter_boxed_get_type::())); + let mut closure_value = + glib::Value::from_type_unchecked(from_glib(filter_boxed_get_type::())); glib::gobject_ffi::g_value_take_boxed( closure_value.to_glib_none_mut().0, Arc::into_raw(Arc::new(func_box)) as gpointer, @@ -137,7 +138,7 @@ where let func_ptr = &mut func as *mut F as gpointer; let mut accum = Some(init); - let mut ret = glib::Value::from_type(glib::Type::POINTER); + let mut ret = glib::Value::from_type_unchecked(glib::Type::POINTER); glib::gobject_ffi::g_value_set_pointer( ret.to_glib_none_mut().0, &mut accum as *mut _ as gpointer, diff --git a/gstreamer/src/serde_macros.rs b/gstreamer/src/serde_macros.rs index d632431ab..27b4a5a23 100644 --- a/gstreamer/src/serde_macros.rs +++ b/gstreamer/src/serde_macros.rs @@ -112,7 +112,7 @@ macro_rules! bitflags_deserialize_impl { return Ok(Self::Value::empty()); } - let mut gvalue = glib::Value::from_type(Self::Value::static_type()); + let mut gvalue = unsafe { glib::Value::from_type_unchecked(Self::Value::static_type()) }; let tokens = value.split('+'); let class = FlagsClass::new(Self::Value::static_type()).unwrap(); diff --git a/gstreamer/src/value.rs b/gstreamer/src/value.rs index 5cd175810..ddf85b9ac 100644 --- a/gstreamer/src/value.rs +++ b/gstreamer/src/value.rs @@ -1306,7 +1306,7 @@ impl GstValueExt for glib::Value { assert_initialized_main_thread!(); unsafe { - let mut value = glib::Value::from_type(pspec.value_type()); + let mut value = glib::Value::from_type_unchecked(pspec.value_type()); let ret: bool = from_glib(ffi::gst_value_deserialize_with_pspec( value.to_glib_none_mut().0, s.to_glib_none().0,