diff --git a/rust-bindings/rust/conf/libostree.toml b/rust-bindings/rust/conf/libostree.toml index f76fd2f6..52059c90 100644 --- a/rust-bindings/rust/conf/libostree.toml +++ b/rust-bindings/rust/conf/libostree.toml @@ -10,7 +10,6 @@ girs_dir = "../gir-files" generate = [ "OSTree.AsyncProgress", - "OSTree.CollectionRef", "OSTree.GpgSignatureFormatFlags", "OSTree.GpgVerifyResult", "OSTree.ObjectType", @@ -50,6 +49,20 @@ manual = [ "GLib.Variant", ] +[[object]] +name = "OSTree.CollectionRef" +status = "generate" + [[object.function]] + pattern = "dupv|equal|freev|hash" + ignore = true + +[[object]] +name = "OSTree.MutableTree" +status = "generate" + [[object.function]] + pattern = "lookup" + ignore = true + [[object]] name = "OSTree.Repo" status = "generate" @@ -80,13 +93,6 @@ status = "generate" pattern = "tree_query_child" ignore = true -[[object]] -name = "OSTree.MutableTree" -status = "generate" - [[object.function]] - pattern = "lookup" - ignore = true - [[object]] name = "OSTree.*" status = "generate" diff --git a/rust-bindings/rust/src/auto/collection_ref.rs b/rust-bindings/rust/src/auto/collection_ref.rs index d52f95c6..b5232bb2 100644 --- a/rust-bindings/rust/src/auto/collection_ref.rs +++ b/rust-bindings/rust/src/auto/collection_ref.rs @@ -6,12 +6,11 @@ use ffi; use glib::translate::*; use glib_ffi; use gobject_ffi; -use std::hash; use std::mem; use std::ptr; glib_wrapper! { - #[derive(Debug, PartialOrd, Ord)] + #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct CollectionRef(Boxed); match fn { @@ -37,48 +36,4 @@ impl CollectionRef { from_glib_full(ffi::ostree_collection_ref_dup(self.to_glib_none().0)) } } - - #[cfg(any(feature = "v2018_6", feature = "dox"))] - pub fn dupv(refs: &[&CollectionRef]) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::ostree_collection_ref_dupv(refs.to_glib_none().0)) - } - } - - #[cfg(any(feature = "v2018_6", feature = "dox"))] - fn equal<'a, P: Into>>(&self, ref2: P) -> bool { - unsafe { - from_glib(ffi::ostree_collection_ref_equal(ToGlibPtr::<*mut ffi::OstreeCollectionRef>::to_glib_none(self).0 as glib_ffi::gconstpointer, ToGlibPtr::<*mut ffi::OstreeCollectionRef>::to_glib_none(ref2).0 as glib_ffi::gconstpointer)) - } - } - - #[cfg(any(feature = "v2018_6", feature = "dox"))] - pub fn freev(refs: &[&CollectionRef]) { - unsafe { - ffi::ostree_collection_ref_freev(refs.to_glib_full()); - } - } - - #[cfg(any(feature = "v2018_6", feature = "dox"))] - fn hash(&self) -> u32 { - unsafe { - ffi::ostree_collection_ref_hash(ToGlibPtr::<*mut ffi::OstreeCollectionRef>::to_glib_none(self).0 as glib_ffi::gconstpointer) - } - } -} - -impl PartialEq for CollectionRef { - #[inline] - fn eq(&self, other: &Self) -> bool { - self.equal(other) - } -} - -impl Eq for CollectionRef {} - -impl hash::Hash for CollectionRef { - #[inline] - fn hash(&self, state: &mut H) where H: hash::Hasher { - hash::Hash::hash(&self.hash(), state) - } }