Generate trait signature once for manual code

Author: bilelmoussaoui

gio/src/action_map.rs

@@ -4,14 +4,8 @@ use glib::{clone, prelude::*};
 
 use crate::{prelude::*, ActionEntry, ActionMap, SimpleAction};
 
-pub trait ActionMapExtManual {
+pub trait ActionMapExtManual: IsA<ActionMap> {
     #[doc(alias = "g_action_map_add_action_entries")]
-    fn add_action_entries(&self, entries: impl IntoIterator<Item = ActionEntry<Self>>)
-    where
-        Self: IsA<ActionMap>;
-}
-
-impl<O: IsA<ActionMap>> ActionMapExtManual for O {
     fn add_action_entries(&self, entries: impl IntoIterator<Item = ActionEntry<Self>>) {
         for entry in entries.into_iter() {
             let action = if let Some(state) = entry.state() {
@@ -23,16 +17,18 @@ impl<O: IsA<ActionMap>> ActionMapExtManual for O {
             if let Some(callback) = entry.activate {
                 action.connect_activate(clone!(@strong action_map =>  move |action, state| {
                     // safe to unwrap as O: IsA<ActionMap>
-                    callback(action_map.downcast_ref::<O>().unwrap(), action, state);
+                    callback(action_map.downcast_ref::<Self>().unwrap(), action, state);
                 }));
             }
             if let Some(callback) = entry.change_state {
                 action.connect_change_state(clone!(@strong action_map => move |action, state| {
                     // safe to unwrap as O: IsA<ActionMap>
-                    callback(action_map.downcast_ref::<O>().unwrap(), action, state);
+                    callback(action_map.downcast_ref::<Self>().unwrap(), action, state);
                 }));
             }
             self.as_ref().add_action(&action);
         }
     }
 }
+
+impl<O: IsA<ActionMap>> ActionMapExtManual for O {}

gio/src/app_info.rs

@@ -17,34 +17,10 @@ use crate::AppLaunchContext;
 #[cfg(feature = "v2_60")]
 use crate::Cancellable;
 
-pub trait AppInfoExtManual: 'static {
+pub trait AppInfoExtManual: IsA<AppInfo> + 'static {
     #[cfg(feature = "v2_60")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v2_60")))]
     #[doc(alias = "g_app_info_launch_uris_async")]
-    fn launch_uris_async<
-        P: IsA<AppLaunchContext>,
-        Q: IsA<Cancellable>,
-        R: FnOnce(Result<(), glib::Error>) + 'static,
-    >(
-        &self,
-        uris: &[&str],
-        context: Option<&P>,
-        cancellable: Option<&Q>,
-        callback: R,
-    );
-
-    #[cfg(feature = "v2_60")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "v2_60")))]
-    fn launch_uris_future<P: IsA<AppLaunchContext> + Clone + 'static>(
-        &self,
-        uris: &[&str],
-        context: Option<&P>,
-    ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>>;
-}
-
-impl<O: IsA<AppInfo>> AppInfoExtManual for O {
-    #[cfg(feature = "v2_60")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "v2_60")))]
     fn launch_uris_async<
         P: IsA<AppLaunchContext>,
         Q: IsA<Cancellable>,
@@ -133,3 +109,5 @@ impl<O: IsA<AppInfo>> AppInfoExtManual for O {
         ))
     }
 }
+
+impl<O: IsA<AppInfo>> AppInfoExtManual for O {}

gio/src/application.rs

@@ -11,25 +11,12 @@ use glib::{
 
 use crate::{Application, File};
 
-pub trait ApplicationExtManual {
+pub trait ApplicationExtManual: IsA<Application> {
     #[doc(alias = "g_application_run")]
-    fn run(&self) -> ExitCode;
-    #[doc(alias = "g_application_run")]
-    fn run_with_args<S: AsRef<str>>(&self, args: &[S]) -> ExitCode;
-    fn connect_open<F: Fn(&Self, &[File], &str) + 'static>(&self, f: F) -> SignalHandlerId;
-
-    #[doc(alias = "g_application_hold")]
-    fn hold(&self) -> ApplicationHoldGuard;
-
-    #[doc(alias = "g_application_mark_busy")]
-    fn mark_busy(&self) -> ApplicationBusyGuard;
-}
-
-impl<O: IsA<Application>> ApplicationExtManual for O {
     fn run(&self) -> ExitCode {
         self.run_with_args(&std::env::args().collect::<Vec<_>>())
     }
-
+    #[doc(alias = "g_application_run")]
     fn run_with_args<S: AsRef<str>>(&self, args: &[S]) -> ExitCode {
         let argv: Vec<&str> = args.iter().map(|a| a.as_ref()).collect();
         let argc = argv.len() as i32;
@@ -38,7 +25,6 @@ impl<O: IsA<Application>> ApplicationExtManual for O {
         };
         ExitCode::from(exit_code)
     }
-
     fn connect_open<F: Fn(&Self, &[File], &str) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn open_trampoline<P, F: Fn(&P, &[File], &str) + 'static>(
             this: *mut ffi::GApplication,
@@ -70,13 +56,15 @@ impl<O: IsA<Application>> ApplicationExtManual for O {
         }
     }
 
+    #[doc(alias = "g_application_hold")]
     fn hold(&self) -> ApplicationHoldGuard {
         unsafe {
             ffi::g_application_hold(self.as_ref().to_glib_none().0);
         }
         ApplicationHoldGuard(self.as_ref().downgrade())
     }
 
+    #[doc(alias = "g_application_mark_busy")]
     fn mark_busy(&self) -> ApplicationBusyGuard {
         unsafe {
             ffi::g_application_mark_busy(self.as_ref().to_glib_none().0);
@@ -85,6 +73,8 @@ impl<O: IsA<Application>> ApplicationExtManual for O {
     }
 }
 
+impl<O: IsA<Application>> ApplicationExtManual for O {}
+
 #[derive(Debug)]
 #[must_use = "if unused the Application will immediately be released"]
 pub struct ApplicationHoldGuard(glib::WeakRef<Application>);

gio/src/cancellable.rs

@@ -32,7 +32,7 @@ impl TryFromGlib<libc::c_ulong> for CancelledHandlerId {
     }
 }
 
-pub trait CancellableExtManual {
+pub trait CancellableExtManual: IsA<Cancellable> {
     // rustdoc-stripper-ignore-next
     /// Convenience function to connect to the `signal::Cancellable::cancelled` signal. Also
     /// handles the race condition that may happen if the cancellable is cancelled right before
@@ -51,39 +51,6 @@ pub trait CancellableExtManual {
     /// # Returns
     ///
     /// The id of the signal handler or `None` if `self` has already been cancelled.
-    #[doc(alias = "g_cancellable_connect")]
-    fn connect_cancelled<F: FnOnce(&Self) + Send + 'static>(
-        &self,
-        callback: F,
-    ) -> Option<CancelledHandlerId>;
-    // rustdoc-stripper-ignore-next
-    /// Local variant of [`Self::connect_cancelled`].
-    #[doc(alias = "g_cancellable_connect")]
-    fn connect_cancelled_local<F: FnOnce(&Self) + 'static>(
-        &self,
-        callback: F,
-    ) -> Option<CancelledHandlerId>;
-    // rustdoc-stripper-ignore-next
-    /// Disconnects a handler from a cancellable instance. Additionally, in the event that a signal
-    /// handler is currently running, this call will block until the handler has finished. Calling
-    /// this function from a callback registered with [`Self::connect_cancelled`] will therefore
-    /// result in a deadlock.
-    ///
-    /// This avoids a race condition where a thread cancels at the same time as the cancellable
-    /// operation is finished and the signal handler is removed.
-    #[doc(alias = "g_cancellable_disconnect")]
-    fn disconnect_cancelled(&self, id: CancelledHandlerId);
-    // rustdoc-stripper-ignore-next
-    /// Returns a `Future` that completes when the cancellable becomes cancelled. Completes
-    /// immediately if the cancellable is already cancelled.
-    fn future(&self) -> std::pin::Pin<Box<dyn Future<Output = ()> + Send + Sync + 'static>>;
-    // rustdoc-stripper-ignore-next
-    /// Set an error if the cancellable is already cancelled.
-    #[doc(alias = "g_cancellable_set_error_if_cancelled")]
-    fn set_error_if_cancelled(&self) -> Result<(), glib::Error>;
-}
-
-impl<O: IsA<Cancellable>> CancellableExtManual for O {
     #[doc(alias = "g_cancellable_connect")]
     fn connect_cancelled<F: FnOnce(&Self) + Send + 'static>(
         &self,
@@ -116,6 +83,8 @@ impl<O: IsA<Cancellable>> CancellableExtManual for O {
             ))
         }
     }
+    // rustdoc-stripper-ignore-next
+    /// Local variant of [`Self::connect_cancelled`].
     #[doc(alias = "g_cancellable_connect")]
     fn connect_cancelled_local<F: FnOnce(&Self) + 'static>(
         &self,
@@ -125,10 +94,21 @@ impl<O: IsA<Cancellable>> CancellableExtManual for O {
 
         self.connect_cancelled(move |obj| (callback.into_inner())(obj))
     }
+    // rustdoc-stripper-ignore-next
+    /// Disconnects a handler from a cancellable instance. Additionally, in the event that a signal
+    /// handler is currently running, this call will block until the handler has finished. Calling
+    /// this function from a callback registered with [`Self::connect_cancelled`] will therefore
+    /// result in a deadlock.
+    ///
+    /// This avoids a race condition where a thread cancels at the same time as the cancellable
+    /// operation is finished and the signal handler is removed.
     #[doc(alias = "g_cancellable_disconnect")]
     fn disconnect_cancelled(&self, id: CancelledHandlerId) {
         unsafe { ffi::g_cancellable_disconnect(self.as_ptr() as *mut _, id.as_raw()) };
     }
+    // rustdoc-stripper-ignore-next
+    /// Returns a `Future` that completes when the cancellable becomes cancelled. Completes
+    /// immediately if the cancellable is already cancelled.
     fn future(&self) -> std::pin::Pin<Box<dyn Future<Output = ()> + Send + Sync + 'static>> {
         let cancellable = self.as_ref().clone();
         let (tx, rx) = oneshot::channel();
@@ -142,7 +122,9 @@ impl<O: IsA<Cancellable>> CancellableExtManual for O {
             }
         })
     }
-
+    // rustdoc-stripper-ignore-next
+    /// Set an error if the cancellable is already cancelled.
+    #[doc(alias = "g_cancellable_set_error_if_cancelled")]
     fn set_error_if_cancelled(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
@@ -162,6 +144,8 @@ impl<O: IsA<Cancellable>> CancellableExtManual for O {
     }
 }
 
+impl<O: IsA<Cancellable>> CancellableExtManual for O {}
+
 #[cfg(test)]
 mod tests {
     use super::*;

gio/src/converter.rs

@@ -6,17 +6,7 @@ use glib::{prelude::*, translate::*};
 
 use crate::{Converter, ConverterFlags, ConverterResult};
 
-pub trait ConverterExtManual {
-    #[doc(alias = "g_converter_convert")]
-    fn convert<IN: AsRef<[u8]>, OUT: AsMut<[u8]>>(
-        &self,
-        inbuf: IN,
-        outbuf: OUT,
-        flags: ConverterFlags,
-    ) -> Result<(ConverterResult, usize, usize), glib::Error>;
-}
-
-impl<O: IsA<Converter>> ConverterExtManual for O {
+pub trait ConverterExtManual: IsA<Converter> + 'static {
     #[doc(alias = "g_converter_convert")]
     fn convert<IN: AsRef<[u8]>, OUT: AsMut<[u8]>>(
         &self,
@@ -61,3 +51,5 @@ impl<O: IsA<Converter>> ConverterExtManual for O {
         }
     }
 }
+
+impl<O: IsA<Converter>> ConverterExtManual for O {}

gio/src/data_input_stream.rs

@@ -6,71 +6,8 @@ use glib::{prelude::*, translate::*, GString};
 
 use crate::{Cancellable, DataInputStream};
 
-pub trait DataInputStreamExtManual: 'static {
+pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
     #[doc(alias = "g_data_input_stream_read_line")]
-    fn read_line<P: IsA<Cancellable>>(
-        &self,
-        cancellable: Option<&P>,
-    ) -> Result<Vec<u8>, glib::Error>;
-
-    #[doc(alias = "g_data_input_stream_read_line_async")]
-    fn read_line_async<P: IsA<Cancellable>, Q: FnOnce(Result<Vec<u8>, glib::Error>) + 'static>(
-        &self,
-        io_priority: glib::Priority,
-        cancellable: Option<&P>,
-        callback: Q,
-    );
-
-    fn read_line_future(
-        &self,
-        io_priority: glib::Priority,
-    ) -> Pin<Box_<dyn std::future::Future<Output = Result<Vec<u8>, glib::Error>> + 'static>>;
-
-    #[doc(alias = "g_data_input_stream_read_line_utf8")]
-    fn read_line_utf8<P: IsA<Cancellable>>(
-        &self,
-        cancellable: Option<&P>,
-    ) -> Result<Option<GString>, glib::Error>;
-
-    fn read_line_utf8_async<
-        P: IsA<Cancellable>,
-        Q: FnOnce(Result<Option<GString>, glib::Error>) + 'static,
-    >(
-        &self,
-        io_priority: glib::Priority,
-        cancellable: Option<&P>,
-        callback: Q,
-    );
-
-    fn read_line_utf8_future(
-        &self,
-        io_priority: glib::Priority,
-    ) -> Pin<Box_<dyn std::future::Future<Output = Result<Option<GString>, glib::Error>> + 'static>>;
-
-    #[doc(alias = "g_data_input_stream_read_upto")]
-    fn read_upto<P: IsA<Cancellable>>(
-        &self,
-        stop_chars: &[u8],
-        cancellable: Option<&P>,
-    ) -> Result<Vec<u8>, glib::Error>;
-
-    #[doc(alias = "g_data_input_stream_read_upto_async")]
-    fn read_upto_async<P: IsA<Cancellable>, Q: FnOnce(Result<Vec<u8>, glib::Error>) + 'static>(
-        &self,
-        stop_chars: &[u8],
-        io_priority: glib::Priority,
-        cancellable: Option<&P>,
-        callback: Q,
-    );
-
-    fn read_upto_future(
-        &self,
-        stop_chars: &[u8],
-        io_priority: glib::Priority,
-    ) -> Pin<Box_<dyn std::future::Future<Output = Result<Vec<u8>, glib::Error>> + 'static>>;
-}
-
-impl<O: IsA<DataInputStream>> DataInputStreamExtManual for O {
     fn read_line<P: IsA<Cancellable>>(
         &self,
         cancellable: Option<&P>,
@@ -93,6 +30,7 @@ impl<O: IsA<DataInputStream>> DataInputStreamExtManual for O {
         }
     }
 
+    #[doc(alias = "g_data_input_stream_read_line_async")]
     fn read_line_async<P: IsA<Cancellable>, Q: FnOnce(Result<Vec<u8>, glib::Error>) + 'static>(
         &self,
         io_priority: glib::Priority,
@@ -163,6 +101,7 @@ impl<O: IsA<DataInputStream>> DataInputStreamExtManual for O {
         ))
     }
 
+    #[doc(alias = "g_data_input_stream_read_line_utf8")]
     fn read_line_utf8<P: IsA<Cancellable>>(
         &self,
         cancellable: Option<&P>,
@@ -255,6 +194,7 @@ impl<O: IsA<DataInputStream>> DataInputStreamExtManual for O {
         ))
     }
 
+    #[doc(alias = "g_data_input_stream_read_upto")]
     fn read_upto<P: IsA<Cancellable>>(
         &self,
         stop_chars: &[u8],
@@ -284,6 +224,7 @@ impl<O: IsA<DataInputStream>> DataInputStreamExtManual for O {
         }
     }
 
+    #[doc(alias = "g_data_input_stream_read_upto_async")]
     fn read_upto_async<P: IsA<Cancellable>, Q: FnOnce(Result<Vec<u8>, glib::Error>) + 'static>(
         &self,
         stop_chars: &[u8],
@@ -363,3 +304,5 @@ impl<O: IsA<DataInputStream>> DataInputStreamExtManual for O {
         ))
     }
 }
+
+impl<O: IsA<DataInputStream>> DataInputStreamExtManual for O {}