Update to 2.42 as minimum GLib version

#436

Author: sdroege

Cargo.toml

@@ -25,25 +25,21 @@ lazy_static = "1.2"
 libc = "0.2"
 bitflags = "1.0"
 futures-preview = { version = "0.2", optional = true }
-glib-sys = { git = "https://github.com/gtk-rs/sys" }
-gobject-sys = { git = "https://github.com/gtk-rs/sys" }
+glib-sys = { git = "https://github.com/gtk-rs/sys", features = ["v2_40"] }
+gobject-sys = { git = "https://github.com/gtk-rs/sys", features = ["v2_42"] }
 
 [dev-dependencies]
 tempfile = "3"
 
 [features]
-v2_34 = ["glib-sys/v2_34", "gobject-sys/v2_34"]
-v2_36 = ["v2_34", "glib-sys/v2_36", "gobject-sys/v2_36"]
-v2_38 = ["v2_36", "glib-sys/v2_38", "gobject-sys/v2_38"]
-v2_40 = ["v2_38", "glib-sys/v2_40"]
-v2_44 = ["v2_40", "glib-sys/v2_44", "gobject-sys/v2_44"]
+v2_44 = ["glib-sys/v2_44", "gobject-sys/v2_44"]
 v2_46 = ["v2_44", "glib-sys/v2_46", "gobject-sys/v2_46"]
 v2_48 = ["v2_46", "glib-sys/v2_48"]
 v2_50 = ["v2_48", "glib-sys/v2_50"]
 v2_52 = ["v2_50", "glib-sys/v2_52"]
 v2_54 = ["v2_52", "glib-sys/v2_54", "gobject-sys/v2_54"]
 v2_56 = ["v2_54", "glib-sys/v2_56"]
 v2_58 = ["v2_56", "glib-sys/v2_58"]
-futures = ["futures-preview", "v2_36"]
+futures = ["futures-preview"]
 subclassing = []
 dox = ["glib-sys/dox", "gobject-sys/dox"]

Gir.toml

@@ -2,10 +2,11 @@
 girs_dir = "gir-files"
 library = "GLib"
 version = "2.0"
-min_cfg_version = "2.32"
+min_cfg_version = "2.42"
 target_path = "."
 work_mode = "normal"
 single_version_file = true
+deprecate_by_min_version = true
 
 generate = [
     "GLib.DateDay",

Gir_GObject.toml

@@ -2,11 +2,12 @@
 girs_dir = "gir-files"
 library = "GObject"
 version = "2.0"
-min_cfg_version = "2.32"
+min_cfg_version = "2.42"
 target_path = "."
 auto_path = "src/gobject/auto"
 work_mode = "normal"
 single_version_file = true
+deprecate_by_min_version = true
 
 generate = [
     "GObject.BindingFlags",

src/key_file.rs

@@ -16,7 +16,6 @@ use gstring::GString;
 use KeyFile;
 
 impl KeyFile {
-    #[cfg(any(feature = "v2_40", feature = "dox"))]
     pub fn save_to_file<T: AsRef<std::path::Path>>(&self, filename: T) -> Result<(), Error> {
         unsafe {
             let mut error = ptr::null_mut();

src/lib.rs

@@ -198,9 +198,7 @@ pub mod value;
 pub mod variant;
 mod variant_type;
 mod main_context;
-#[cfg(any(feature="v2_36", feature = "dox"))]
 mod main_context_channel;
-#[cfg(any(feature="v2_36", feature = "dox"))]
 pub use main_context_channel::{Sender, SyncSender, Receiver};
 mod date;
 pub use date::Date;

src/param_spec.rs

@@ -4,7 +4,6 @@
 //
 // TODO: Implement custom subtyping here for things like GParamSpecInt to get
 // default/min/max values and similar
-#[cfg(any(feature = "v2_38", feature = "dox"))]
 use Value;
 use gobject_ffi as ffi;
 use gobject_ffi;
@@ -51,7 +50,6 @@ impl ParamSpec {
         }
     }
 
-    #[cfg(any(feature = "v2_38", feature = "dox"))]
     pub fn get_default_value(&self) -> Option<Value> {
         unsafe {
             from_glib_none(ffi::g_param_spec_get_default_value(self.to_glib_none().0))

src/source.rs

@@ -4,15 +4,15 @@
 
 use std::cell::RefCell;
 use std::mem::transmute;
-#[cfg(all(unix, any(feature = "v2_36", feature = "dox")))]
+#[cfg(any(unix, feature = "dox"))]
 use std::os::unix::io::RawFd;
 #[cfg(all(not(unix), feature = "dox"))]
 use libc::c_int as RawFd;
 use std::process;
 use std::thread;
 use ffi as glib_ffi;
 use ffi::{gboolean, gpointer};
-#[cfg(any(all(feature = "v2_36", unix), feature = "dox"))]
+#[cfg(any(unix, feature = "dox"))]
 use IOCondition;
 use translate::{from_glib, from_glib_full, FromGlib, ToGlib, ToGlibPtr};
 use libc;
@@ -131,19 +131,19 @@ fn into_raw_child_watch<F: FnMut(Pid, i32) + Send + 'static>(func: F) -> gpointe
     Box::into_raw(func) as gpointer
 }
 
-#[cfg(any(all(feature = "v2_36", unix), feature = "dox"))]
+#[cfg(any(unix, feature = "dox"))]
 #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
 unsafe extern "C" fn trampoline_unix_fd(fd: i32, condition: glib_ffi::GIOCondition, func: gpointer) -> gboolean {
     let func: &RefCell<Box<FnMut(RawFd, IOCondition) -> Continue + 'static>> = transmute(func);
     (&mut *func.borrow_mut())(fd, from_glib(condition)).to_glib()
 }
 
-#[cfg(any(all(feature = "v2_36", unix), feature = "dox"))]
+#[cfg(any(unix, feature = "dox"))]
 unsafe extern "C" fn destroy_closure_unix_fd(ptr: gpointer) {
     Box::<RefCell<Box<FnMut(RawFd, IOCondition) + 'static>>>::from_raw(ptr as *mut _);
 }
 
-#[cfg(any(all(feature = "v2_36", unix), feature = "dox"))]
+#[cfg(any(unix, feature = "dox"))]
 fn into_raw_unix_fd<F: FnMut(RawFd, IOCondition) -> Continue + Send + 'static>(func: F) -> gpointer {
     let func: Box<RefCell<Box<FnMut(RawFd, IOCondition) -> Continue + Send + 'static>>> =
         Box::new(RefCell::new(Box::new(func)));
@@ -228,7 +228,7 @@ where F: FnMut() -> Continue + Send + 'static {
     }
 }
 
-#[cfg(any(all(feature = "v2_36", unix), feature = "dox"))]
+#[cfg(any(unix, feature = "dox"))]
 /// Adds a closure to be called by the main loop the returned `Source` is attached to whenever a
 /// UNIX file descriptor reaches the given IO condition.
 ///
@@ -400,7 +400,7 @@ where F: FnMut() -> Continue + Send + 'static {
     }
 }
 
-#[cfg(any(all(feature = "v2_36", unix), feature = "dox"))]
+#[cfg(any(unix, feature = "dox"))]
 /// Adds a closure to be called by the main loop the returned `Source` is attached to whenever a
 /// UNIX file descriptor reaches the given IO condition.
 ///

src/variant.rs

@@ -314,15 +314,9 @@ impl StaticVariantType for str {
 }
 
 impl ToVariant for str {
-    #[cfg(any(feature = "v2_38"))]
     fn to_variant(&self) -> Variant {
         unsafe { from_glib_none(glib_ffi::g_variant_new_take_string(self.to_glib_full())) }
     }
-
-    #[cfg(not(feature = "v2_38"))]
-    fn to_variant(&self) -> Variant {
-        unsafe { from_glib_none(glib_ffi::g_variant_new_string(self.to_glib_none().0)) }
-    }
 }
 
 impl<T: ToVariant> From<T> for Variant {