From 493ba2e2f5e6860a47135fc4f4e90f4308414d55 Mon Sep 17 00:00:00 2001 From: Felix Krull Date: Fri, 24 May 2019 21:55:05 +0200 Subject: [PATCH] Update gir and regenerate --- rust-bindings/rust/Makefile | 3 +-- rust-bindings/rust/src/auto/deployment.rs | 4 ++-- rust-bindings/rust/src/auto/versions.txt | 2 +- rust-bindings/rust/sys/src/auto/versions.txt | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile index b4a8342a..60946763 100644 --- a/rust-bindings/rust/Makefile +++ b/rust-bindings/rust/Makefile @@ -5,8 +5,7 @@ all: gir # -- gir generation -- target/tools/bin/gir: - #cargo install --root target/tools --git https://github.com/gtk-rs/gir.git --rev fec179c697a03e4aa98c610f7b98fd1b0ceb9344 -- gir - cargo install --root target/tools --git https://github.com/fkrull/gir.git --branch fixup-gconstpointer -- gir + cargo install --root target/tools --git https://github.com/gtk-rs/gir.git --rev f511aaeee8a324dc8d23b7a854121739b9bfcd2e -- gir gir: target/tools/bin/gir target/tools/bin/gir -c conf/ostree-sys.toml diff --git a/rust-bindings/rust/src/auto/deployment.rs b/rust-bindings/rust/src/auto/deployment.rs index a8b4a7e3..e2ed855a 100644 --- a/rust-bindings/rust/src/auto/deployment.rs +++ b/rust-bindings/rust/src/auto/deployment.rs @@ -35,7 +35,7 @@ impl Deployment { pub fn equal(&self, bp: &Deployment) -> bool { unsafe { - from_glib(ostree_sys::ostree_deployment_equal(ToGlibPtr::<*const ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer, ToGlibPtr::<*const ostree_sys::OstreeDeployment>::to_glib_none(bp).0 as glib_sys::gconstpointer)) + from_glib(ostree_sys::ostree_deployment_equal(ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer, ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(bp).0 as glib_sys::gconstpointer)) } } @@ -140,7 +140,7 @@ impl Deployment { pub fn hash(&self) -> u32 { unsafe { - ostree_sys::ostree_deployment_hash(ToGlibPtr::<*const ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer) + ostree_sys::ostree_deployment_hash(ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer) } } diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt index f51e58a2..d0752571 100644 --- a/rust-bindings/rust/src/auto/versions.txt +++ b/rust-bindings/rust/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 1bff597) +Generated by gir (https://github.com/gtk-rs/gir @ f511aae) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt index be52760a..d0752571 100644 --- a/rust-bindings/rust/sys/src/auto/versions.txt +++ b/rust-bindings/rust/sys/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ fec179c) +Generated by gir (https://github.com/gtk-rs/gir @ f511aae) from gir-files (https://github.com/gtk-rs/gir-files @ ???)