From dd0cfc6d4b8ef4f470cd4aa8d661b9570e327ecb Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Fri, 4 Mar 2022 14:28:34 +0000 Subject: [PATCH] ostree: refresh after gir bump --- rust-bindings/src/auto/constants.rs | 4 ++++ rust-bindings/src/auto/enums.rs | 15 +++++++++++++++ rust-bindings/src/auto/flags.rs | 6 +++++- rust-bindings/src/auto/mod.rs | 3 +++ rust-bindings/src/auto/repo.rs | 7 +++++++ rust-bindings/src/auto/repo_finder_result.rs | 1 - 6 files changed, 34 insertions(+), 2 deletions(-) diff --git a/rust-bindings/src/auto/constants.rs b/rust-bindings/src/auto/constants.rs index 56b8647a..396d5c85 100644 --- a/rust-bindings/src/auto/constants.rs +++ b/rust-bindings/src/auto/constants.rs @@ -56,6 +56,10 @@ pub static META_KEY_DEPLOY_COLLECTION_ID: once_cell::sync::Lazy<&'static str> = #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))] #[doc(alias = "OSTREE_ORIGIN_TRANSIENT_GROUP")] pub static ORIGIN_TRANSIENT_GROUP: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_ORIGIN_TRANSIENT_GROUP).to_str().unwrap()}); +#[cfg(any(feature = "v2022_2", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_2")))] +#[doc(alias = "OSTREE_PATH_BOOTED")] +pub static PATH_BOOTED: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_PATH_BOOTED).to_str().unwrap()}); #[cfg(any(feature = "v2018_6", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))] #[doc(alias = "OSTREE_REPO_METADATA_REF")] diff --git a/rust-bindings/src/auto/enums.rs b/rust-bindings/src/auto/enums.rs index dd6ad465..2eecdb97 100644 --- a/rust-bindings/src/auto/enums.rs +++ b/rust-bindings/src/auto/enums.rs @@ -193,6 +193,10 @@ pub enum ObjectType { CommitMeta, #[doc(alias = "OSTREE_OBJECT_TYPE_PAYLOAD_LINK")] PayloadLink, + #[doc(alias = "OSTREE_OBJECT_TYPE_FILE_XATTRS")] + FileXattrs, + #[doc(alias = "OSTREE_OBJECT_TYPE_FILE_XATTRS_LINK")] + FileXattrsLink, #[doc(hidden)] __Unknown(i32), } @@ -207,6 +211,8 @@ impl fmt::Display for ObjectType { Self::TombstoneCommit => "TombstoneCommit", Self::CommitMeta => "CommitMeta", Self::PayloadLink => "PayloadLink", + Self::FileXattrs => "FileXattrs", + Self::FileXattrsLink => "FileXattrsLink", _ => "Unknown", }) } @@ -225,6 +231,8 @@ impl IntoGlib for ObjectType { Self::TombstoneCommit => ffi::OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT, Self::CommitMeta => ffi::OSTREE_OBJECT_TYPE_COMMIT_META, Self::PayloadLink => ffi::OSTREE_OBJECT_TYPE_PAYLOAD_LINK, + Self::FileXattrs => ffi::OSTREE_OBJECT_TYPE_FILE_XATTRS, + Self::FileXattrsLink => ffi::OSTREE_OBJECT_TYPE_FILE_XATTRS_LINK, Self::__Unknown(value) => value, } } @@ -241,6 +249,8 @@ impl FromGlib for ObjectType { ffi::OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT => Self::TombstoneCommit, ffi::OSTREE_OBJECT_TYPE_COMMIT_META => Self::CommitMeta, ffi::OSTREE_OBJECT_TYPE_PAYLOAD_LINK => Self::PayloadLink, + ffi::OSTREE_OBJECT_TYPE_FILE_XATTRS => Self::FileXattrs, + ffi::OSTREE_OBJECT_TYPE_FILE_XATTRS_LINK => Self::FileXattrsLink, value => Self::__Unknown(value), } } @@ -522,6 +532,8 @@ pub enum RepoMode { BareUser, #[doc(alias = "OSTREE_REPO_MODE_BARE_USER_ONLY")] BareUserOnly, + #[doc(alias = "OSTREE_REPO_MODE_BARE_SPLIT_XATTRS")] + BareSplitXattrs, #[doc(hidden)] __Unknown(i32), } @@ -533,6 +545,7 @@ impl fmt::Display for RepoMode { Self::Archive => "Archive", Self::BareUser => "BareUser", Self::BareUserOnly => "BareUserOnly", + Self::BareSplitXattrs => "BareSplitXattrs", _ => "Unknown", }) } @@ -548,6 +561,7 @@ impl IntoGlib for RepoMode { Self::Archive => ffi::OSTREE_REPO_MODE_ARCHIVE, Self::BareUser => ffi::OSTREE_REPO_MODE_BARE_USER, Self::BareUserOnly => ffi::OSTREE_REPO_MODE_BARE_USER_ONLY, + Self::BareSplitXattrs => ffi::OSTREE_REPO_MODE_BARE_SPLIT_XATTRS, Self::__Unknown(value) => value, } } @@ -561,6 +575,7 @@ impl FromGlib for RepoMode { ffi::OSTREE_REPO_MODE_ARCHIVE => Self::Archive, ffi::OSTREE_REPO_MODE_BARE_USER => Self::BareUser, ffi::OSTREE_REPO_MODE_BARE_USER_ONLY => Self::BareUserOnly, + ffi::OSTREE_REPO_MODE_BARE_SPLIT_XATTRS => Self::BareSplitXattrs, value => Self::__Unknown(value), } } diff --git a/rust-bindings/src/auto/flags.rs b/rust-bindings/src/auto/flags.rs index b9dbcbae..0a08e5f7 100644 --- a/rust-bindings/src/auto/flags.rs +++ b/rust-bindings/src/auto/flags.rs @@ -202,7 +202,9 @@ bitflags! { #[doc(alias = "OstreeRepoCommitTraverseFlags")] pub struct RepoCommitTraverseFlags: u32 { #[doc(alias = "OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE")] - const REPO_COMMIT_TRAVERSE_FLAG_NONE = ffi::OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE as u32; + const NONE = ffi::OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE as u32; + #[doc(alias = "OSTREE_REPO_COMMIT_TRAVERSE_FLAG_COMMIT_ONLY")] + const COMMIT_ONLY = ffi::OSTREE_REPO_COMMIT_TRAVERSE_FLAG_COMMIT_ONLY as u32; } } @@ -309,6 +311,8 @@ bitflags! { const NO_PRUNE = ffi::OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE as u32; #[doc(alias = "OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY")] const REFS_ONLY = ffi::OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY as u32; + #[doc(alias = "OSTREE_REPO_PRUNE_FLAGS_COMMIT_ONLY")] + const COMMIT_ONLY = ffi::OSTREE_REPO_PRUNE_FLAGS_COMMIT_ONLY as u32; } } diff --git a/rust-bindings/src/auto/mod.rs b/rust-bindings/src/auto/mod.rs index a4816c6b..c6618214 100644 --- a/rust-bindings/src/auto/mod.rs +++ b/rust-bindings/src/auto/mod.rs @@ -193,6 +193,9 @@ pub use self::constants::META_KEY_DEPLOY_COLLECTION_ID; #[cfg(any(feature = "v2018_3", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))] pub use self::constants::ORIGIN_TRANSIENT_GROUP; +#[cfg(any(feature = "v2022_2", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_2")))] +pub use self::constants::PATH_BOOTED; #[cfg(any(feature = "v2018_6", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))] pub use self::constants::REPO_METADATA_REF; diff --git a/rust-bindings/src/auto/repo.rs b/rust-bindings/src/auto/repo.rs index 8f1784a6..84c5bd07 100644 --- a/rust-bindings/src/auto/repo.rs +++ b/rust-bindings/src/auto/repo.rs @@ -1055,6 +1055,13 @@ impl Repo { // unsafe { TODO: call ffi:ostree_repo_traverse_commit_union_with_parents() } //} + //#[cfg(any(feature = "v2018_5", feature = "dox"))] + //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))] + //#[doc(alias = "ostree_repo_traverse_commit_with_flags")] + //pub fn traverse_commit_with_flags>(&self, flags: RepoCommitTraverseFlags, commit_checksum: &str, maxdepth: i32, inout_reachable: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 25 }/TypeId { ns_id: 0, id: 25 }, inout_parents: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 25 }/TypeId { ns_id: 0, id: 25 }, cancellable: Option<&P>) -> Result<(), glib::Error> { + // unsafe { TODO: call ffi:ostree_repo_traverse_commit_with_flags() } + //} + //#[cfg(any(feature = "v2018_6", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))] //#[doc(alias = "ostree_repo_traverse_reachable_refs")] diff --git a/rust-bindings/src/auto/repo_finder_result.rs b/rust-bindings/src/auto/repo_finder_result.rs index 00c7bd0f..b6850ca7 100644 --- a/rust-bindings/src/auto/repo_finder_result.rs +++ b/rust-bindings/src/auto/repo_finder_result.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use std::cmp; -use glib::translate::ToGlibPtr; glib::wrapper! { #[derive(Debug, Hash)]