glib: Remove a couple of unnecessary trait impls for glib::ObjectRef

Author: sdroege

glib/src/object.rs

@@ -462,90 +462,6 @@ impl<'a> ToGlibPtr<'a, *mut gobject_ffi::GObject> for ObjectRef {
     }
 }
 
-#[doc(hidden)]
-impl<'a> ToGlibContainerFromSlice<'a, *mut *mut gobject_ffi::GObject> for ObjectRef {
-    type Storage = (
-        Vec<Stash<'a, *mut gobject_ffi::GObject, ObjectRef>>,
-        Option<Vec<*mut gobject_ffi::GObject>>,
-    );
-
-    fn to_glib_none_from_slice(
-        t: &'a [ObjectRef],
-    ) -> (*mut *mut gobject_ffi::GObject, Self::Storage) {
-        let v: Vec<_> = t.iter().map(|s| s.to_glib_none()).collect();
-        let mut v_ptr: Vec<_> = v.iter().map(|s| s.0).collect();
-        v_ptr.push(ptr::null_mut() as *mut gobject_ffi::GObject);
-
-        (
-            v_ptr.as_ptr() as *mut *mut gobject_ffi::GObject,
-            (v, Some(v_ptr)),
-        )
-    }
-
-    fn to_glib_container_from_slice(
-        t: &'a [ObjectRef],
-    ) -> (*mut *mut gobject_ffi::GObject, Self::Storage) {
-        let v: Vec<_> = t.iter().map(|s| s.to_glib_none()).collect();
-
-        let v_ptr = unsafe {
-            let v_ptr = ffi::g_malloc0(mem::size_of::<*mut gobject_ffi::GObject>() * (t.len() + 1))
-                as *mut *mut gobject_ffi::GObject;
-
-            for (i, s) in v.iter().enumerate() {
-                ptr::write(v_ptr.add(i), s.0);
-            }
-
-            v_ptr
-        };
-
-        (v_ptr, (v, None))
-    }
-
-    fn to_glib_full_from_slice(t: &[ObjectRef]) -> *mut *mut gobject_ffi::GObject {
-        unsafe {
-            let v_ptr =
-                ffi::g_malloc0(std::mem::size_of::<*mut gobject_ffi::GObject>() * (t.len() + 1))
-                    as *mut *mut gobject_ffi::GObject;
-
-            for (i, s) in t.iter().enumerate() {
-                ptr::write(v_ptr.add(i), s.to_glib_full());
-            }
-
-            v_ptr
-        }
-    }
-}
-
-#[doc(hidden)]
-impl<'a> ToGlibContainerFromSlice<'a, *const *mut gobject_ffi::GObject> for ObjectRef {
-    type Storage = (
-        Vec<Stash<'a, *mut gobject_ffi::GObject, ObjectRef>>,
-        Option<Vec<*mut gobject_ffi::GObject>>,
-    );
-
-    fn to_glib_none_from_slice(
-        t: &'a [ObjectRef],
-    ) -> (*const *mut gobject_ffi::GObject, Self::Storage) {
-        let (ptr, stash) =
-            ToGlibContainerFromSlice::<'a, *mut *mut gobject_ffi::GObject>::to_glib_none_from_slice(
-                t,
-            );
-        (ptr as *const *mut gobject_ffi::GObject, stash)
-    }
-
-    fn to_glib_container_from_slice(
-        _: &'a [ObjectRef],
-    ) -> (*const *mut gobject_ffi::GObject, Self::Storage) {
-        // Can't have consumer free a *const pointer
-        unimplemented!()
-    }
-
-    fn to_glib_full_from_slice(_: &[ObjectRef]) -> *const *mut gobject_ffi::GObject {
-        // Can't have consumer free a *const pointer
-        unimplemented!()
-    }
-}
-
 #[doc(hidden)]
 impl FromGlibPtrNone<*mut gobject_ffi::GObject> for ObjectRef {
     #[inline]
@@ -603,122 +519,6 @@ impl FromGlibPtrBorrow<*const gobject_ffi::GObject> for ObjectRef {
     }
 }
 
-#[doc(hidden)]
-impl FromGlibContainerAsVec<*mut gobject_ffi::GObject, *mut *mut gobject_ffi::GObject>
-    for ObjectRef
-{
-    unsafe fn from_glib_none_num_as_vec(
-        ptr: *mut *mut gobject_ffi::GObject,
-        num: usize,
-    ) -> Vec<Self> {
-        if num == 0 || ptr.is_null() {
-            return Vec::new();
-        }
-
-        // Attention: This takes ownership of floating references!
-        let mut res = Vec::with_capacity(num);
-        for i in 0..num {
-            res.push(from_glib_none(ptr::read(ptr.add(i))));
-        }
-        res
-    }
-
-    unsafe fn from_glib_container_num_as_vec(
-        ptr: *mut *mut gobject_ffi::GObject,
-        num: usize,
-    ) -> Vec<Self> {
-        // Attention: This takes ownership of floating references!
-        let res = FromGlibContainerAsVec::from_glib_none_num_as_vec(ptr, num);
-        ffi::g_free(ptr as *mut _);
-        res
-    }
-
-    unsafe fn from_glib_full_num_as_vec(
-        ptr: *mut *mut gobject_ffi::GObject,
-        num: usize,
-    ) -> Vec<Self> {
-        if num == 0 || ptr.is_null() {
-            ffi::g_free(ptr as *mut _);
-            return Vec::new();
-        }
-
-        let mut res = Vec::with_capacity(num);
-        for i in 0..num {
-            res.push(from_glib_full(ptr::read(ptr.add(i))));
-        }
-        ffi::g_free(ptr as *mut _);
-        res
-    }
-}
-
-#[doc(hidden)]
-impl FromGlibPtrArrayContainerAsVec<*mut gobject_ffi::GObject, *mut *mut gobject_ffi::GObject>
-    for ObjectRef
-{
-    unsafe fn from_glib_none_as_vec(ptr: *mut *mut gobject_ffi::GObject) -> Vec<Self> {
-        // Attention: This takes ownership of floating references!
-        FromGlibContainerAsVec::from_glib_none_num_as_vec(ptr, c_ptr_array_len(ptr))
-    }
-
-    unsafe fn from_glib_container_as_vec(ptr: *mut *mut gobject_ffi::GObject) -> Vec<Self> {
-        // Attention: This takes ownership of floating references!
-        FromGlibContainerAsVec::from_glib_container_num_as_vec(ptr, c_ptr_array_len(ptr))
-    }
-
-    unsafe fn from_glib_full_as_vec(ptr: *mut *mut gobject_ffi::GObject) -> Vec<Self> {
-        FromGlibContainerAsVec::from_glib_full_num_as_vec(ptr, c_ptr_array_len(ptr))
-    }
-}
-
-#[doc(hidden)]
-impl FromGlibContainerAsVec<*mut gobject_ffi::GObject, *const *mut gobject_ffi::GObject>
-    for ObjectRef
-{
-    unsafe fn from_glib_none_num_as_vec(
-        ptr: *const *mut gobject_ffi::GObject,
-        num: usize,
-    ) -> Vec<Self> {
-        // Attention: This takes ownership of floating references!
-        FromGlibContainerAsVec::from_glib_none_num_as_vec(ptr as *mut *mut _, num)
-    }
-
-    unsafe fn from_glib_container_num_as_vec(
-        _: *const *mut gobject_ffi::GObject,
-        _: usize,
-    ) -> Vec<Self> {
-        // Can't free a *const
-        unimplemented!()
-    }
-
-    unsafe fn from_glib_full_num_as_vec(
-        _: *const *mut gobject_ffi::GObject,
-        _: usize,
-    ) -> Vec<Self> {
-        // Can't free a *const
-        unimplemented!()
-    }
-}
-
-#[doc(hidden)]
-impl FromGlibPtrArrayContainerAsVec<*mut gobject_ffi::GObject, *const *mut gobject_ffi::GObject>
-    for ObjectRef
-{
-    unsafe fn from_glib_none_as_vec(ptr: *const *mut gobject_ffi::GObject) -> Vec<Self> {
-        // Attention: This takes ownership of floating references!
-        FromGlibPtrArrayContainerAsVec::from_glib_none_as_vec(ptr as *mut *mut _)
-    }
-
-    unsafe fn from_glib_container_as_vec(_: *const *mut gobject_ffi::GObject) -> Vec<Self> {
-        // Can't free a *const
-        unimplemented!()
-    }
-
-    unsafe fn from_glib_full_as_vec(_: *const *mut gobject_ffi::GObject) -> Vec<Self> {
-        // Can't free a *const
-        unimplemented!()
-    }
-}
-
 #[repr(transparent)]
 pub struct TypedObjectRef<T, P> {
     inner: ObjectRef,