move function bodies from ExtManual impls to traits

Author: jf2048

gdk4-wayland/src/wayland_surface.rs

@@ -11,15 +11,9 @@ use wayland_client::{backend::ObjectId, protocol::wl_surface::WlSurface, Proxy};
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`WaylandSurface`](crate::WaylandSurface).
-pub trait WaylandSurfaceExtManual: 'static {
+pub trait WaylandSurfaceExtManual: IsA<WaylandSurface> + 'static {
     #[doc(alias = "gdk_wayland_surface_get_wl_surface")]
     #[doc(alias = "get_wl_surface")]
-    #[cfg(any(feature = "wayland_crate", docsrs))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
-    fn wl_surface(&self) -> Option<WlSurface>;
-}
-
-impl<O: IsA<WaylandSurface>> WaylandSurfaceExtManual for O {
     #[cfg(any(feature = "wayland_crate", docsrs))]
     #[cfg_attr(docsrs, doc(cfg(feature = "wayland_crate")))]
     fn wl_surface(&self) -> Option<WlSurface> {
@@ -42,3 +36,5 @@ impl<O: IsA<WaylandSurface>> WaylandSurfaceExtManual for O {
         }
     }
 }
+
+impl<O: IsA<WaylandSurface>> WaylandSurfaceExtManual for O {}

gdk4/src/content_provider.rs

@@ -5,12 +5,8 @@ use glib::translate::*;
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`ContentProvider`](crate::ContentProvider).
-pub trait ContentProviderExtManual {
+pub trait ContentProviderExtManual: IsA<ContentProvider> {
     #[doc(alias = "gdk_content_provider_get_value")]
-    fn value(&self, type_: glib::Type) -> Result<glib::Value, glib::Error>;
-}
-
-impl<O: IsA<ContentProvider>> ContentProviderExtManual for O {
     fn value(&self, type_: glib::Type) -> Result<glib::Value, glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
@@ -28,3 +24,5 @@ impl<O: IsA<ContentProvider>> ContentProviderExtManual for O {
         }
     }
 }
+
+impl<O: IsA<ContentProvider>> ContentProviderExtManual for O {}

gdk4/src/display.rs

@@ -52,30 +52,8 @@ impl Backend {
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`Display`](crate::Display).
-pub trait DisplayExtManual: 'static {
+pub trait DisplayExtManual: IsA<Display> + 'static {
     #[doc(alias = "gdk_display_translate_key")]
-    fn translate_key(
-        &self,
-        keycode: u32,
-        state: ModifierType,
-        group: i32,
-    ) -> Option<(Key, i32, i32, ModifierType)>;
-
-    #[doc(alias = "gdk_display_get_setting")]
-    fn get_setting(&self, name: impl IntoGStr) -> Option<glib::Value>;
-
-    #[doc(alias = "gdk_display_map_keyval")]
-    fn map_keyval(&self, keyval: Key) -> Option<Vec<KeymapKey>>;
-
-    #[doc(alias = "gdk_display_map_keycode")]
-    fn map_keycode(&self, keycode: u32) -> Option<Vec<(KeymapKey, Key)>>;
-
-    // rustdoc-stripper-ignore-next
-    /// Get the currently used display backend
-    fn backend(&self) -> Backend;
-}
-
-impl<O: IsA<Display>> DisplayExtManual for O {
     fn translate_key(
         &self,
         keycode: u32,
@@ -114,6 +92,7 @@ impl<O: IsA<Display>> DisplayExtManual for O {
         }
     }
 
+    #[doc(alias = "gdk_display_get_setting")]
     fn get_setting(&self, name: impl IntoGStr) -> Option<glib::Value> {
         unsafe {
             name.run_with_gstr(|name| {
@@ -132,6 +111,7 @@ impl<O: IsA<Display>> DisplayExtManual for O {
         }
     }
 
+    #[doc(alias = "gdk_display_map_keyval")]
     fn map_keyval(&self, keyval: Key) -> Option<Vec<KeymapKey>> {
         unsafe {
             let mut keys = ptr::null_mut();
@@ -153,6 +133,7 @@ impl<O: IsA<Display>> DisplayExtManual for O {
         }
     }
 
+    #[doc(alias = "gdk_display_map_keycode")]
     fn map_keycode(&self, keycode: u32) -> Option<Vec<(KeymapKey, Key)>> {
         unsafe {
             let mut keys = ptr::null_mut();
@@ -178,6 +159,8 @@ impl<O: IsA<Display>> DisplayExtManual for O {
         }
     }
 
+    // rustdoc-stripper-ignore-next
+    /// Get the currently used display backend
     fn backend(&self) -> Backend {
         match self.as_ref().type_().name() {
             "GdkWaylandDisplay" => Backend::Wayland,
@@ -189,3 +172,5 @@ impl<O: IsA<Display>> DisplayExtManual for O {
         }
     }
 }
+
+impl<O: IsA<Display>> DisplayExtManual for O {}

gdk4/src/drag_surface.rs

@@ -9,19 +9,10 @@ use std::{boxed::Box as Box_, mem::transmute};
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`DragSurface`](crate::DragSurface).
-pub trait DragSurfaceExtManual {
+pub trait DragSurfaceExtManual: IsA<DragSurface> {
     #[cfg(any(feature = "v4_12", docsrs))]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "compute-size")]
-    fn connect_compute_size<F: Fn(&DragSurface, &mut DragSurfaceSize) + 'static>(
-        &self,
-        f: F,
-    ) -> SignalHandlerId;
-}
-
-impl<O: IsA<DragSurface>> DragSurfaceExtManual for O {
-    #[cfg(any(feature = "v4_12", docsrs))]
-    #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     fn connect_compute_size<F: Fn(&DragSurface, &mut DragSurfaceSize) + 'static>(
         &self,
         f: F,
@@ -52,3 +43,5 @@ impl<O: IsA<DragSurface>> DragSurfaceExtManual for O {
         }
     }
 }
+
+impl<O: IsA<DragSurface>> DragSurfaceExtManual for O {}

gdk4/src/draw_context.rs

@@ -5,13 +5,9 @@ use glib::translate::*;
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`DrawContext`](crate::DrawContext).
-pub trait DrawContextExtManual: 'static {
+pub trait DrawContextExtManual: IsA<DrawContext> + 'static {
     #[doc(alias = "gdk_draw_context_get_frame_region")]
     #[doc(alias = "get_frame_region")]
-    fn frame_region(&self) -> Option<cairo::Region>;
-}
-
-impl<O: IsA<DrawContext>> DrawContextExtManual for O {
     fn frame_region(&self) -> Option<cairo::Region> {
         unsafe {
             from_glib_none(
@@ -21,3 +17,5 @@ impl<O: IsA<DrawContext>> DrawContextExtManual for O {
         }
     }
 }
+
+impl<O: IsA<DrawContext>> DrawContextExtManual for O {}

gdk4/src/surface.rs

@@ -5,20 +5,8 @@ use glib::translate::*;
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`Surface`](crate::Surface).
-pub trait SurfaceExtManual: 'static {
+pub trait SurfaceExtManual: IsA<Surface> + 'static {
     #[doc(alias = "gdk_surface_create_similar_surface")]
-    fn create_similar_surface(
-        &self,
-        content: cairo::Content,
-        width: i32,
-        height: i32,
-    ) -> cairo::Surface;
-
-    #[doc(alias = "gdk_surface_translate_coordinates")]
-    fn translate_coordinates(&self, to: &Surface, x: f64, y: f64) -> bool;
-}
-
-impl<O: IsA<Surface>> SurfaceExtManual for O {
     fn create_similar_surface(
         &self,
         content: cairo::Content,
@@ -35,6 +23,7 @@ impl<O: IsA<Surface>> SurfaceExtManual for O {
         }
     }
 
+    #[doc(alias = "gdk_surface_translate_coordinates")]
     fn translate_coordinates(&self, to: &Surface, mut x: f64, mut y: f64) -> bool {
         unsafe {
             from_glib(ffi::gdk_surface_translate_coordinates(
@@ -46,3 +35,5 @@ impl<O: IsA<Surface>> SurfaceExtManual for O {
         }
     }
 }
+
+impl<O: IsA<Surface>> SurfaceExtManual for O {}

gdk4/src/texture.rs

@@ -5,12 +5,8 @@ use glib::translate::*;
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`Texture`](crate::Texture).
-pub trait TextureExtManual: 'static {
+pub trait TextureExtManual: IsA<Texture> + 'static {
     #[doc(alias = "gdk_texture_download")]
-    fn download(&self, data: &mut [u8], stride: usize);
-}
-
-impl<O: IsA<Texture>> TextureExtManual for O {
     fn download(&self, data: &mut [u8], stride: usize) {
         unsafe {
             assert!(
@@ -29,3 +25,5 @@ impl<O: IsA<Texture>> TextureExtManual for O {
         }
     }
 }
+
+impl<O: IsA<Texture>> TextureExtManual for O {}

gdk4/src/toplevel.rs

@@ -9,14 +9,7 @@ use std::{boxed::Box as Box_, mem::transmute};
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`Toplevel`](crate::Toplevel).
-pub trait ToplevelExtManual {
-    fn connect_compute_size<F: Fn(&Toplevel, &mut ToplevelSize) + 'static>(
-        &self,
-        f: F,
-    ) -> SignalHandlerId;
-}
-
-impl<O: IsA<Toplevel>> ToplevelExtManual for O {
+pub trait ToplevelExtManual: IsA<Toplevel> {
     fn connect_compute_size<F: Fn(&Toplevel, &mut ToplevelSize) + 'static>(
         &self,
         f: F,
@@ -44,3 +37,5 @@ impl<O: IsA<Toplevel>> ToplevelExtManual for O {
         }
     }
 }
+
+impl<O: IsA<Toplevel>> ToplevelExtManual for O {}

gtk4/src/accessible.rs

@@ -25,21 +25,9 @@ use glib::{translate::*, Value};
 ///     gtk::accessible::State::Invalid(gtk::AccessibleInvalidState::Grammar),
 /// ]);
 /// ```
-pub trait AccessibleExtManual {
+pub trait AccessibleExtManual: IsA<Accessible> {
     #[doc(alias = "gtk_accessible_update_property")]
     #[doc(alias = "gtk_accessible_update_property_value")]
-    fn update_property(&self, properties: &[Property]);
-
-    #[doc(alias = "gtk_accessible_update_relation")]
-    #[doc(alias = "gtk_accessible_update_relation_value")]
-    fn update_relation(&self, relations: &[Relation]);
-
-    #[doc(alias = "gtk_accessible_update_state")]
-    #[doc(alias = "gtk_accessible_update_state_value")]
-    fn update_state(&self, states: &[State]);
-}
-
-impl<O: IsA<Accessible>> AccessibleExtManual for O {
     fn update_property(&self, properties: &[Property]) {
         let mut properties_ptr = vec![];
         let mut values = vec![];
@@ -59,6 +47,8 @@ impl<O: IsA<Accessible>> AccessibleExtManual for O {
         }
     }
 
+    #[doc(alias = "gtk_accessible_update_relation")]
+    #[doc(alias = "gtk_accessible_update_relation_value")]
     fn update_relation(&self, relations: &[Relation]) {
         let mut relations_ptr = vec![];
         let mut values = vec![];
@@ -78,6 +68,8 @@ impl<O: IsA<Accessible>> AccessibleExtManual for O {
         }
     }
 
+    #[doc(alias = "gtk_accessible_update_state")]
+    #[doc(alias = "gtk_accessible_update_state_value")]
     fn update_state(&self, states: &[State]) {
         let mut states_ptr = vec![];
         let mut values = vec![];
@@ -98,6 +90,8 @@ impl<O: IsA<Accessible>> AccessibleExtManual for O {
     }
 }
 
+impl<O: IsA<Accessible>> AccessibleExtManual for O {}
+
 // rustdoc-stripper-ignore-next
 /// Type-safe enum container for [`AccessibleProperty`](crate::AccessibleProperty) values.
 #[derive(Debug)]

gtk4/src/actionable.rs

@@ -5,13 +5,9 @@ use glib::{translate::*, Variant};
 
 // rustdoc-stripper-ignore-next
 /// Trait containing manually implemented methods of [`Actionable`](crate::Actionable).
-pub trait ActionableExtManual: 'static {
+pub trait ActionableExtManual: IsA<Actionable> + 'static {
     #[doc(alias = "gtk_actionable_set_action_target")]
     #[doc(alias = "gtk_actionable_set_action_target_value")]
-    fn set_action_target(&self, target: Option<impl Into<Variant>>);
-}
-
-impl<O: IsA<Actionable>> ActionableExtManual for O {
     fn set_action_target(&self, target: Option<impl Into<Variant>>) {
         unsafe {
             ffi::gtk_actionable_set_action_target_value(
@@ -21,3 +17,5 @@ impl<O: IsA<Actionable>> ActionableExtManual for O {
         }
     }
 }
+
+impl<O: IsA<Actionable>> ActionableExtManual for O {}