Merge pull request gtk-rs#85 from MathieuDuponchelle/async_callbacks

Async callbacks

Author: GuillaumeGomez

Gir.toml

@@ -47,13 +47,16 @@ generate = [
     "Gio.SocketProtocol",
     "Gio.SocketAddress",
     "Gio.InetSocketAddress",
+    "Gio.SocketAddressEnumerator",
     "Gio.SocketConnectable",
     "Gio.SocketConnection",
     "Gio.SocketService",
     "Gio.SocketListenerEvent",
+    "Gio.SocketClient",
     "Gio.SocketClientEvent",
     "Gio.ThreadedSocketService",
     "Gio.TcpConnection",
+    "Gio.Resolver",
     "Gio.ResolverRecordType",
     "Gio.SrvTarget",
     "Gio.NetworkAddress",
@@ -76,6 +79,7 @@ manual = [
     "GLib.VariantType",
     "GLib.IOCondition",
     "GLib.Source",
+    "GLib.Priority",
     "GObject.Object",
 ]
 
@@ -110,10 +114,6 @@ status = "generate"
 [[object]]
 name = "Gio.BufferedInputStream"
 status = "generate"
-    [[object.function]]
-    name = "fill_async"
-    #manual return type
-    ignore = true
     [[object.function]]
     name = "peek"
     #have almost same peek_buffer
@@ -127,6 +127,11 @@ status = "generate"
     #return vec of u8
     ignore = true
 
+    [[object.function]]
+    name = "read_line_async"
+    #return vec of u8
+    ignore = true
+
 [[object]]
 name = "Gio.File"
 status = "generate"
@@ -157,46 +162,6 @@ status = "generate"
     name = "find_enclosing_mount_async"
     # Mount
     ignore = true
-    [[object.function]]
-    name = "append_to_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "create_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "create_readwrite_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "open_readwrite_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "query_filesystem_info_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "query_info_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "read_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "replace_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "replace_readwrite_async"
-    # wrong async return
-    ignore = true
-    [[object.function]]
-    name = "set_display_name_async"
-    # wrong async return
-    ignore = true
 
 [[object]]
 name = "Gio.FilterInputStream"
@@ -237,14 +202,6 @@ status = "generate"
     pattern = "read(_all)?(_async)?"
     #mutable buffer
     ignore = true
-    [[object.function]]
-    name = "read_bytes_async"
-    #wrong async callback type
-    ignore = true
-    [[object.function]]
-    name = "skip_async"
-    #wrong async callback type
-    ignore = true
 
 [[object]]
 name = "Gio.MemoryInputStream"
@@ -301,22 +258,14 @@ status = "generate"
 [[object]]
 name = "Gio.OutputStream"
 status = "generate"
-    [[object.function]]
-    name = "splice_async"
-    #wrong async callback type
-    ignore = true
     [[object.function]]
     name = "write_async"
-    #wrong async callback type
+    #AsRef<u8>
     ignore = true
     [[object.function]]
     name = "write_all_async"
     #AsRef<u8>
     ignore = true
-    [[object.function]]
-    name = "write_bytes_async"
-    #wrong async callback type
-    ignore = true
 
 [[object]]
 name = "Gio.Settings"
@@ -405,36 +354,12 @@ status = "generate"
     # broken and needs some closer integration with the corresponding std types
     ignore = true
 
-[[object]]
-name = "Gio.SocketAddressEnumerator"
-status = "generate"
-    [[object.function]]
-    name = "next_async"
-    # broken
-    ignore = true
-
 [[object]]
 name = "Gio.SocketListener"
 status = "generate"
     [[object.function]]
-    pattern = ".*_async"
-    # broken
-    ignore = true
-
-[[object]]
-name = "Gio.SocketClient"
-status = "generate"
-    [[object.function]]
-    pattern = ".*_async"
-    # broken
-    ignore = true
-
-[[object]]
-name = "Gio.Resolver"
-status = "generate"
-    [[object.function]]
-    pattern = ".*_async"
-    # broken
+    name = "accept_socket_async"
+    # finish function misses nullable return annotation
     ignore = true
 
 [[object]]

gir

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/action.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/action_group.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/action_map.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/app_info.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/app_launch_context.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/application.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
@@ -45,6 +45,8 @@ impl BufferedInputStream {
 pub trait BufferedInputStreamExt {
     fn fill<'a, P: Into<Option<&'a Cancellable>>>(&self, count: isize, cancellable: P) -> Result<isize, Error>;
 
+    fn fill_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<isize, Error>) + Send + 'static>(&self, count: isize, io_priority: glib::Priority, cancellable: P, callback: Q);
+
     fn get_available(&self) -> usize;
 
     fn get_buffer_size(&self) -> usize;
@@ -69,6 +71,24 @@ impl<O: IsA<BufferedInputStream> + IsA<glib::object::Object>> BufferedInputStrea
         }
     }
 
+    fn fill_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<isize, Error>) + Send + 'static>(&self, count: isize, io_priority: glib::Priority, cancellable: P, callback: Q) {
+        let cancellable = cancellable.into();
+        let cancellable = cancellable.to_glib_none();
+        let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
+        unsafe extern "C" fn fill_async_trampoline<Q: FnOnce(Result<isize, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut ffi::GAsyncResult, user_data: glib_ffi::gpointer)
+        {
+            let mut error = ptr::null_mut();
+            let ret = ffi::g_buffered_input_stream_fill_finish(_source_object as *mut _, res, &mut error);
+            let result = if error.is_null() { Ok(ret) } else { Err(from_glib_full(error)) };
+            let callback: Box<Box<Q>> = Box::from_raw(user_data as *mut _);
+            callback(result);
+        }
+        let callback = fill_async_trampoline::<Q>;
+        unsafe {
+            ffi::g_buffered_input_stream_fill_async(self.to_glib_none().0, count, io_priority.to_glib(), cancellable.0, Some(callback), Box::into_raw(user_data) as *mut _);
+        }
+    }
+
     fn get_available(&self) -> usize {
         unsafe {
             ffi::g_buffered_input_stream_get_available(self.to_glib_none().0)

src/auto/buffered_input_stream.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/buffered_output_stream.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/cancellable.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
@@ -52,8 +52,6 @@ pub trait DataInputStreamExt {
 
     fn read_int64<'a, P: Into<Option<&'a Cancellable>>>(&self, cancellable: P) -> Result<i64, Error>;
 
-    fn read_line_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<usize, Error>) + Send + 'static>(&self, io_priority: i32, cancellable: P, callback: Q);
-
     //fn read_line_finish_utf8<P: IsA</*Ignored*/AsyncResult>>(&self, result: &P) -> Result<(Option<String>, usize), Error>;
 
     fn read_line_utf8<'a, P: Into<Option<&'a Cancellable>>>(&self, cancellable: P) -> Result<(Option<String>, usize), Error>;
@@ -66,11 +64,11 @@ pub trait DataInputStreamExt {
 
     fn read_until<'a, P: Into<Option<&'a Cancellable>>>(&self, stop_chars: &str, cancellable: P) -> Result<(String, usize), Error>;
 
-    fn read_until_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<usize, Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: i32, cancellable: P, callback: Q);
+    fn read_until_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<(String, usize), Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: glib::Priority, cancellable: P, callback: Q);
 
     fn read_upto<'a, P: Into<Option<&'a Cancellable>>>(&self, stop_chars: &str, cancellable: P) -> Result<(String, usize), Error>;
 
-    fn read_upto_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<usize, Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: i32, cancellable: P, callback: Q);
+    fn read_upto_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<(String, usize), Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: glib::Priority, cancellable: P, callback: Q);
 
     fn set_byte_order(&self, order: DataStreamByteOrder);
 
@@ -134,25 +132,6 @@ impl<O: IsA<DataInputStream> + IsA<glib::object::Object>> DataInputStreamExt for
         }
     }
 
-    fn read_line_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<usize, Error>) + Send + 'static>(&self, io_priority: i32, cancellable: P, callback: Q) {
-        let cancellable = cancellable.into();
-        let cancellable = cancellable.to_glib_none();
-        let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
-        unsafe extern "C" fn read_line_async_trampoline<Q: FnOnce(Result<usize, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut ffi::GAsyncResult, user_data: glib_ffi::gpointer)
-        {
-            let mut error = ptr::null_mut();
-            let mut length = mem::uninitialized();
-            let _ = ffi::g_data_input_stream_read_line_finish(_source_object as *mut _, res, &mut length, &mut error);
-            let result = if error.is_null() { Ok(length) } else { Err(from_glib_full(error)) };
-            let callback: Box<Box<Q>> = Box::from_raw(user_data as *mut _);
-            callback(result);
-        }
-        let callback = read_line_async_trampoline::<Q>;
-        unsafe {
-            ffi::g_data_input_stream_read_line_async(self.to_glib_none().0, io_priority, cancellable.0, Some(callback), Box::into_raw(user_data) as *mut _);
-        }
-    }
-
     //fn read_line_finish_utf8<P: IsA</*Ignored*/AsyncResult>>(&self, result: &P) -> Result<(Option<String>, usize), Error> {
     //    unsafe { TODO: call ffi::g_data_input_stream_read_line_finish_utf8() }
     //}
@@ -209,22 +188,22 @@ impl<O: IsA<DataInputStream> + IsA<glib::object::Object>> DataInputStreamExt for
         }
     }
 
-    fn read_until_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<usize, Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: i32, cancellable: P, callback: Q) {
+    fn read_until_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<(String, usize), Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: glib::Priority, cancellable: P, callback: Q) {
         let cancellable = cancellable.into();
         let cancellable = cancellable.to_glib_none();
         let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
-        unsafe extern "C" fn read_until_async_trampoline<Q: FnOnce(Result<usize, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut ffi::GAsyncResult, user_data: glib_ffi::gpointer)
+        unsafe extern "C" fn read_until_async_trampoline<Q: FnOnce(Result<(String, usize), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut ffi::GAsyncResult, user_data: glib_ffi::gpointer)
         {
             let mut error = ptr::null_mut();
             let mut length = mem::uninitialized();
-            let _ = ffi::g_data_input_stream_read_until_finish(_source_object as *mut _, res, &mut length, &mut error);
-            let result = if error.is_null() { Ok(length) } else { Err(from_glib_full(error)) };
+            let ret = ffi::g_data_input_stream_read_until_finish(_source_object as *mut _, res, &mut length, &mut error);
+            let result = if error.is_null() { Ok((from_glib_full(ret), length)) } else { Err(from_glib_full(error)) };
             let callback: Box<Box<Q>> = Box::from_raw(user_data as *mut _);
             callback(result);
         }
         let callback = read_until_async_trampoline::<Q>;
         unsafe {
-            ffi::g_data_input_stream_read_until_async(self.to_glib_none().0, stop_chars.to_glib_none().0, io_priority, cancellable.0, Some(callback), Box::into_raw(user_data) as *mut _);
+            ffi::g_data_input_stream_read_until_async(self.to_glib_none().0, stop_chars.to_glib_none().0, io_priority.to_glib(), cancellable.0, Some(callback), Box::into_raw(user_data) as *mut _);
         }
     }
 
@@ -240,23 +219,23 @@ impl<O: IsA<DataInputStream> + IsA<glib::object::Object>> DataInputStreamExt for
         }
     }
 
-    fn read_upto_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<usize, Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: i32, cancellable: P, callback: Q) {
+    fn read_upto_async<'a, P: Into<Option<&'a Cancellable>>, Q: FnOnce(Result<(String, usize), Error>) + Send + 'static>(&self, stop_chars: &str, io_priority: glib::Priority, cancellable: P, callback: Q) {
         let cancellable = cancellable.into();
         let cancellable = cancellable.to_glib_none();
         let stop_chars_len = stop_chars.len() as isize;
         let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
-        unsafe extern "C" fn read_upto_async_trampoline<Q: FnOnce(Result<usize, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut ffi::GAsyncResult, user_data: glib_ffi::gpointer)
+        unsafe extern "C" fn read_upto_async_trampoline<Q: FnOnce(Result<(String, usize), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut ffi::GAsyncResult, user_data: glib_ffi::gpointer)
         {
             let mut error = ptr::null_mut();
             let mut length = mem::uninitialized();
-            let _ = ffi::g_data_input_stream_read_upto_finish(_source_object as *mut _, res, &mut length, &mut error);
-            let result = if error.is_null() { Ok(length) } else { Err(from_glib_full(error)) };
+            let ret = ffi::g_data_input_stream_read_upto_finish(_source_object as *mut _, res, &mut length, &mut error);
+            let result = if error.is_null() { Ok((from_glib_full(ret), length)) } else { Err(from_glib_full(error)) };
             let callback: Box<Box<Q>> = Box::from_raw(user_data as *mut _);
             callback(result);
         }
         let callback = read_upto_async_trampoline::<Q>;
         unsafe {
-            ffi::g_data_input_stream_read_upto_async(self.to_glib_none().0, stop_chars.to_glib_none().0, stop_chars_len, io_priority, cancellable.0, Some(callback), Box::into_raw(user_data) as *mut _);
+            ffi::g_data_input_stream_read_upto_async(self.to_glib_none().0, stop_chars.to_glib_none().0, stop_chars_len, io_priority.to_glib(), cancellable.0, Some(callback), Box::into_raw(user_data) as *mut _);
         }
     }
 

src/auto/data_input_stream.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 

src/auto/data_output_stream.rs

@@ -1,4 +1,4 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 72ba992)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT