From 54faf595ae0a2fcb972e813533bcb9d2fc9614e7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 27 Feb 2020 17:26:40 +0000 Subject: [PATCH] rust: Bump to glib 0.8 On general principle of keeping up with the latest, but in particular this is prep for using the `ostree` crate. --- rust/Cargo.lock | 32 ++++++++++++++++---------------- rust/Cargo.toml | 6 +++--- rust/src/ffiutil.rs | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 6e145620..9f01a5de 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -263,30 +263,30 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glib" -version = "0.7.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glib-sys" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", @@ -295,10 +295,10 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -616,9 +616,9 @@ dependencies = [ "curl 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "envsubst 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "indicatif 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", @@ -948,10 +948,10 @@ dependencies = [ "checksum failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b" "checksum failure_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231" "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -"checksum gio-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04957c40df00dd72f7c9ec8e382b01ff8ed4a904fcd2fa608b7ae7fbaccfda8f" -"checksum glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e8fdc159c196a5dfa53a92929ac4c10c8a6637ffb43951f3fff89c2cd2365" -"checksum glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5bda542f3caee39a027638e9644ff89204101ad916fd7370b585ad2c5fc97e61" -"checksum gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23e05a14290d3dc255223cba51db4b0f3da438d5250657996fa99b2a30faf43e" +"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" +"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b" +"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" +"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" "checksum indicatif 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a68371cf417889c9d7f98235b7102ea7c54fc59bcbd22f3dea785be9d27e40" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 58423cea..76006094 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -12,9 +12,9 @@ serde_json = "1.0" serde_yaml = "0.8" libc = "0.2" nix = "0.17.0" -glib-sys = "0.8.0" -gio-sys = "0.8.0" -glib = "0.7.1" +glib-sys = "0.9.1" +gio-sys = "0.9.1" +glib = "0.8" tempfile = "3.0.3" clap = "~2.33" structopt = "0.3" diff --git a/rust/src/ffiutil.rs b/rust/src/ffiutil.rs index 8565c88a..0f3633b1 100644 --- a/rust/src/ffiutil.rs +++ b/rust/src/ffiutil.rs @@ -241,7 +241,7 @@ mod tests { assert!(!error.is_null()); assert_eq!((*error).domain, gio_sys::g_io_error_quark()); assert_eq!((*error).code, gio_sys::G_IO_ERROR_FAILED); - let e = glib::Error::wrap(error); + let e: glib::Error = glib::translate::from_glib_full(error); assert_eq!(e.description(), "oops"); } } @@ -255,7 +255,7 @@ mod tests { assert!(!error.is_null()); assert_eq!((*error).domain, gio_sys::g_io_error_quark()); assert_eq!((*error).code, gio_sys::G_IO_ERROR_FAILED); - let e = glib::Error::wrap(error); + let e: glib::Error = glib::translate::from_glib_full(error); assert_eq!(e.description(), "oops"); } }