Merge pull request #372 from sdroege/concurrency

Add various Send/Sync impls where appropriate

Gir.toml

@@ -325,6 +325,7 @@ status = "generate"
 [[object]]
 name = "GLib.Checksum"
 status = "generate"
+concurrency = "send+sync"
     [[object.function]]
     name = "get_digest"
     #wrong array definition
@@ -439,6 +440,7 @@ concurrency = "send+sync"
 [[object]]
 name = "GLib.TimeZone"
 status = "generate"
+concurrency = "send+sync"
     [[object.function]]
     name = "adjust_time"
     # in-out parameter

Gir_GObject.toml

@@ -25,6 +25,7 @@ manual = [
 name = "GObject.Binding"
 status = "generate"
 trait = false
+concurrency = "send+sync"
 
 [[object]]
 name = "GObject.*"

src/auto/checksum.rs

@@ -47,3 +47,6 @@ impl Checksum {
         }
     }
 }
+
+unsafe impl Send for Checksum {}
+unsafe impl Sync for Checksum {}

src/auto/time_zone.rs

@@ -66,3 +66,6 @@ impl TimeZone {
         }
     }
 }
+
+unsafe impl Send for TimeZone {}
+unsafe impl Sync for TimeZone {}

src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
+Generated by gir (https://github.com/gtk-rs/gir @ 7191938)
 from gir-files (https://github.com/gtk-rs/gir-files @ b8f5ef1)

src/closure.rs

@@ -102,6 +102,9 @@ impl Closure {
     }
 }
 
+unsafe impl Send for Closure {}
+unsafe impl Sync for Closure {}
+
 #[cfg(test)]
 mod tests {
     use std::sync::Arc;

src/date.rs

@@ -29,6 +29,7 @@ glib_wrapper! {
 }
 
 unsafe impl Send for Date { }
+unsafe impl Sync for Date { }
 
 impl Date {
     pub fn new() -> Date {

src/gobject/auto/binding.rs

@@ -61,68 +61,71 @@ impl Binding {
         }
     }
 
-    pub fn connect_property_flags_notify<F: Fn(&Binding) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_property_flags_notify<F: Fn(&Binding) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
-            let f: Box_<Box_<Fn(&Binding) + 'static>> = Box_::new(Box_::new(f));
+            let f: Box_<Box_<Fn(&Binding) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
             connect(self.to_glib_none().0, "notify::flags",
                 transmute(notify_flags_trampoline as usize), Box_::into_raw(f) as *mut _)
         }
     }
 
-    pub fn connect_property_source_notify<F: Fn(&Binding) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_property_source_notify<F: Fn(&Binding) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
-            let f: Box_<Box_<Fn(&Binding) + 'static>> = Box_::new(Box_::new(f));
+            let f: Box_<Box_<Fn(&Binding) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
             connect(self.to_glib_none().0, "notify::source",
                 transmute(notify_source_trampoline as usize), Box_::into_raw(f) as *mut _)
         }
     }
 
-    pub fn connect_property_source_property_notify<F: Fn(&Binding) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_property_source_property_notify<F: Fn(&Binding) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
-            let f: Box_<Box_<Fn(&Binding) + 'static>> = Box_::new(Box_::new(f));
+            let f: Box_<Box_<Fn(&Binding) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
             connect(self.to_glib_none().0, "notify::source-property",
                 transmute(notify_source_property_trampoline as usize), Box_::into_raw(f) as *mut _)
         }
     }
 
-    pub fn connect_property_target_notify<F: Fn(&Binding) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_property_target_notify<F: Fn(&Binding) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
-            let f: Box_<Box_<Fn(&Binding) + 'static>> = Box_::new(Box_::new(f));
+            let f: Box_<Box_<Fn(&Binding) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
             connect(self.to_glib_none().0, "notify::target",
                 transmute(notify_target_trampoline as usize), Box_::into_raw(f) as *mut _)
         }
     }
 
-    pub fn connect_property_target_property_notify<F: Fn(&Binding) + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_property_target_property_notify<F: Fn(&Binding) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
-            let f: Box_<Box_<Fn(&Binding) + 'static>> = Box_::new(Box_::new(f));
+            let f: Box_<Box_<Fn(&Binding) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
             connect(self.to_glib_none().0, "notify::target-property",
                 transmute(notify_target_property_trampoline as usize), Box_::into_raw(f) as *mut _)
         }
     }
 }
 
+unsafe impl Send for Binding {}
+unsafe impl Sync for Binding {}
+
 unsafe extern "C" fn notify_flags_trampoline(this: *mut gobject_ffi::GBinding, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    let f: &&(Fn(&Binding) + 'static) = transmute(f);
+    let f: &&(Fn(&Binding) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_source_trampoline(this: *mut gobject_ffi::GBinding, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    let f: &&(Fn(&Binding) + 'static) = transmute(f);
+    let f: &&(Fn(&Binding) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_source_property_trampoline(this: *mut gobject_ffi::GBinding, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    let f: &&(Fn(&Binding) + 'static) = transmute(f);
+    let f: &&(Fn(&Binding) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_target_trampoline(this: *mut gobject_ffi::GBinding, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    let f: &&(Fn(&Binding) + 'static) = transmute(f);
+    let f: &&(Fn(&Binding) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
 
 unsafe extern "C" fn notify_target_property_trampoline(this: *mut gobject_ffi::GBinding, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    let f: &&(Fn(&Binding) + 'static) = transmute(f);
+    let f: &&(Fn(&Binding) + Send + Sync + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }

src/param_spec.rs

@@ -26,6 +26,9 @@ glib_wrapper! {
     }
 }
 
+unsafe impl Send for ParamSpec {}
+unsafe impl Sync for ParamSpec {}
+
 impl ParamSpec {
     pub fn get_value_type(&self) -> ::Type {
         unsafe {

src/string.rs

@@ -27,6 +27,9 @@ glib_wrapper! {
     }
 }
 
+unsafe impl Send for String {}
+unsafe impl Sync for String {}
+
 impl String {
     pub fn new<T: AsRef<[u8]>>(data: T) -> String {
         let bytes = data.as_ref();