diff --git a/gdk-pixbuf/src/auto/pixbuf_animation.rs b/gdk-pixbuf/src/auto/pixbuf_animation.rs index 689eebb6d94e..94f14d99f738 100644 --- a/gdk-pixbuf/src/auto/pixbuf_animation.rs +++ b/gdk-pixbuf/src/auto/pixbuf_animation.rs @@ -137,12 +137,7 @@ impl PixbufAnimation { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PixbufAnimationExt: IsA + sealed::Sealed + 'static { +pub trait PixbufAnimationExt: IsA + 'static { #[doc(alias = "gdk_pixbuf_animation_get_height")] #[doc(alias = "get_height")] fn height(&self) -> i32 { diff --git a/gdk-pixbuf/src/auto/pixbuf_loader.rs b/gdk-pixbuf/src/auto/pixbuf_loader.rs index 5dd296a92e21..6858726fac88 100644 --- a/gdk-pixbuf/src/auto/pixbuf_loader.rs +++ b/gdk-pixbuf/src/auto/pixbuf_loader.rs @@ -63,12 +63,7 @@ impl Default for PixbufLoader { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PixbufLoaderExt: IsA + sealed::Sealed + 'static { +pub trait PixbufLoaderExt: IsA + 'static { #[doc(alias = "gdk_pixbuf_loader_close")] fn close(&self) -> Result<(), glib::Error> { unsafe { diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/gdk-pixbuf/src/auto/versions.txt +++ b/gdk-pixbuf/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/gdk-pixbuf/src/pixbuf_animation.rs b/gdk-pixbuf/src/pixbuf_animation.rs index f41f42e9ca17..9ef9e2911261 100644 --- a/gdk-pixbuf/src/pixbuf_animation.rs +++ b/gdk-pixbuf/src/pixbuf_animation.rs @@ -6,12 +6,7 @@ use glib::{prelude::*, translate::*}; use crate::{ffi, PixbufAnimation, PixbufAnimationIter}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PixbufAnimationExtManual: sealed::Sealed + IsA + 'static { +pub trait PixbufAnimationExtManual: IsA + 'static { #[doc(alias = "gdk_pixbuf_animation_get_iter")] #[doc(alias = "get_iter")] fn iter(&self, start_time: Option) -> PixbufAnimationIter { diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/gdk-pixbuf/sys/versions.txt +++ b/gdk-pixbuf/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/gio/src/action_map.rs b/gio/src/action_map.rs index fc7ff45b6d75..d7099a8b7af5 100644 --- a/gio/src/action_map.rs +++ b/gio/src/action_map.rs @@ -3,13 +3,7 @@ use glib::{clone, prelude::*}; use crate::{prelude::*, ActionEntry, ActionMap, SimpleAction}; - -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ActionMapExtManual: sealed::Sealed + IsA { +pub trait ActionMapExtManual: IsA { #[doc(alias = "g_action_map_add_action_entries")] fn add_action_entries(&self, entries: impl IntoIterator>) { for entry in entries.into_iter() { diff --git a/gio/src/app_info.rs b/gio/src/app_info.rs index 8e10e1eccc53..6a197e0f8508 100644 --- a/gio/src/app_info.rs +++ b/gio/src/app_info.rs @@ -9,12 +9,7 @@ use glib::translate::*; use crate::{ffi, AppInfo, AppLaunchContext, Cancellable}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait AppInfoExtManual: sealed::Sealed + IsA + 'static { +pub trait AppInfoExtManual: IsA + 'static { #[cfg_attr(docsrs, doc(cfg(feature = "v2_60")))] #[doc(alias = "g_app_info_launch_uris_async")] fn launch_uris_async< diff --git a/gio/src/application.rs b/gio/src/application.rs index c91a182120b9..264ebf590399 100644 --- a/gio/src/application.rs +++ b/gio/src/application.rs @@ -11,12 +11,7 @@ use glib::{ use crate::{ffi, Application, File}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ApplicationExtManual: sealed::Sealed + IsA { +pub trait ApplicationExtManual: IsA { #[doc(alias = "g_application_run")] fn run(&self) -> ExitCode { self.run_with_args(&std::env::args().collect::>()) diff --git a/gio/src/auto/action.rs b/gio/src/auto/action.rs index 614bb3c9353f..fc7c7265e2a9 100644 --- a/gio/src/auto/action.rs +++ b/gio/src/auto/action.rs @@ -64,12 +64,7 @@ impl Action { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ActionExt: IsA + sealed::Sealed + 'static { +pub trait ActionExt: IsA + 'static { #[doc(alias = "g_action_activate")] fn activate(&self, parameter: Option<&glib::Variant>) { unsafe { diff --git a/gio/src/auto/action_group.rs b/gio/src/auto/action_group.rs index ea6302e8c6fc..de2602772c82 100644 --- a/gio/src/auto/action_group.rs +++ b/gio/src/auto/action_group.rs @@ -23,12 +23,7 @@ impl ActionGroup { pub const NONE: Option<&'static ActionGroup> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ActionGroupExt: IsA + sealed::Sealed + 'static { +pub trait ActionGroupExt: IsA + 'static { #[doc(alias = "g_action_group_action_added")] fn action_added(&self, action_name: &str) { unsafe { diff --git a/gio/src/auto/action_map.rs b/gio/src/auto/action_map.rs index da7a8519e257..1737450099bd 100644 --- a/gio/src/auto/action_map.rs +++ b/gio/src/auto/action_map.rs @@ -18,12 +18,7 @@ impl ActionMap { pub const NONE: Option<&'static ActionMap> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ActionMapExt: IsA + sealed::Sealed + 'static { +pub trait ActionMapExt: IsA + 'static { #[doc(alias = "g_action_map_add_action")] fn add_action(&self, action: &impl IsA) { unsafe { diff --git a/gio/src/auto/app_info.rs b/gio/src/auto/app_info.rs index 899cfc307f44..e9253c9beb4d 100644 --- a/gio/src/auto/app_info.rs +++ b/gio/src/auto/app_info.rs @@ -339,12 +339,7 @@ impl AppInfo { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait AppInfoExt: IsA + sealed::Sealed + 'static { +pub trait AppInfoExt: IsA + 'static { #[doc(alias = "g_app_info_add_supports_type")] fn add_supports_type(&self, content_type: &str) -> Result<(), glib::Error> { unsafe { diff --git a/gio/src/auto/app_launch_context.rs b/gio/src/auto/app_launch_context.rs index 05541e154e08..9f27f554fa27 100644 --- a/gio/src/auto/app_launch_context.rs +++ b/gio/src/auto/app_launch_context.rs @@ -34,12 +34,7 @@ impl Default for AppLaunchContext { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait AppLaunchContextExt: IsA + sealed::Sealed + 'static { +pub trait AppLaunchContextExt: IsA + 'static { #[doc(alias = "g_app_launch_context_get_display")] #[doc(alias = "get_display")] fn display(&self, info: &impl IsA, files: &[File]) -> Option { diff --git a/gio/src/auto/application.rs b/gio/src/auto/application.rs index 5fd5a2906a04..1f0be0c90db3 100644 --- a/gio/src/auto/application.rs +++ b/gio/src/auto/application.rs @@ -128,12 +128,7 @@ impl ApplicationBuilder { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ApplicationExt: IsA + sealed::Sealed + 'static { +pub trait ApplicationExt: IsA + 'static { #[doc(alias = "g_application_activate")] fn activate(&self) { unsafe { diff --git a/gio/src/auto/application_command_line.rs b/gio/src/auto/application_command_line.rs index 29663d075f59..51ccbb676a9c 100644 --- a/gio/src/auto/application_command_line.rs +++ b/gio/src/auto/application_command_line.rs @@ -23,14 +23,7 @@ impl ApplicationCommandLine { pub const NONE: Option<&'static ApplicationCommandLine> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ApplicationCommandLineExt: - IsA + sealed::Sealed + 'static -{ +pub trait ApplicationCommandLineExt: IsA + 'static { #[doc(alias = "g_application_command_line_create_file_for_arg")] fn create_file_for_arg(&self, arg: impl AsRef) -> File { unsafe { diff --git a/gio/src/auto/async_initable.rs b/gio/src/auto/async_initable.rs index 378f0973848e..1bca5e03cd1f 100644 --- a/gio/src/auto/async_initable.rs +++ b/gio/src/auto/async_initable.rs @@ -19,12 +19,7 @@ impl AsyncInitable { pub const NONE: Option<&'static AsyncInitable> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait AsyncInitableExt: IsA + sealed::Sealed + 'static { +pub trait AsyncInitableExt: IsA + 'static { #[doc(alias = "g_async_initable_init_async")] unsafe fn init_async) + 'static>( &self, diff --git a/gio/src/auto/async_result.rs b/gio/src/auto/async_result.rs index f9c7e751eb58..76e82c254f64 100644 --- a/gio/src/auto/async_result.rs +++ b/gio/src/auto/async_result.rs @@ -18,12 +18,7 @@ impl AsyncResult { pub const NONE: Option<&'static AsyncResult> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait AsyncResultExt: IsA + sealed::Sealed + 'static { +pub trait AsyncResultExt: IsA + 'static { #[doc(alias = "g_async_result_get_source_object")] #[doc(alias = "get_source_object")] fn source_object(&self) -> Option { diff --git a/gio/src/auto/buffered_input_stream.rs b/gio/src/auto/buffered_input_stream.rs index b592c9e3e9ca..9d67441ffb31 100644 --- a/gio/src/auto/buffered_input_stream.rs +++ b/gio/src/auto/buffered_input_stream.rs @@ -104,12 +104,7 @@ impl BufferedInputStreamBuilder { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait BufferedInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait BufferedInputStreamExt: IsA + 'static { #[doc(alias = "g_buffered_input_stream_fill")] fn fill( &self, diff --git a/gio/src/auto/buffered_output_stream.rs b/gio/src/auto/buffered_output_stream.rs index 8a0d59f9b105..cbd42e5d6d81 100644 --- a/gio/src/auto/buffered_output_stream.rs +++ b/gio/src/auto/buffered_output_stream.rs @@ -110,12 +110,7 @@ impl BufferedOutputStreamBuilder { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait BufferedOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait BufferedOutputStreamExt: IsA + 'static { #[doc(alias = "g_buffered_output_stream_get_auto_grow")] #[doc(alias = "get_auto_grow")] #[doc(alias = "auto-grow")] diff --git a/gio/src/auto/cancellable.rs b/gio/src/auto/cancellable.rs index 24042f9798bb..cb831eb61480 100644 --- a/gio/src/auto/cancellable.rs +++ b/gio/src/auto/cancellable.rs @@ -38,12 +38,7 @@ impl Default for Cancellable { unsafe impl Send for Cancellable {} unsafe impl Sync for Cancellable {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait CancellableExt: IsA + sealed::Sealed + 'static { +pub trait CancellableExt: IsA + 'static { #[doc(alias = "g_cancellable_cancel")] fn cancel(&self) { unsafe { diff --git a/gio/src/auto/converter.rs b/gio/src/auto/converter.rs index c7e86376ad37..a815dc437c81 100644 --- a/gio/src/auto/converter.rs +++ b/gio/src/auto/converter.rs @@ -18,12 +18,7 @@ impl Converter { pub const NONE: Option<&'static Converter> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ConverterExt: IsA + sealed::Sealed + 'static { +pub trait ConverterExt: IsA + 'static { #[cfg(feature = "v2_82")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_82")))] #[doc(alias = "g_converter_convert_bytes")] diff --git a/gio/src/auto/converter_input_stream.rs b/gio/src/auto/converter_input_stream.rs index daf2b6e392a5..2226da532eb1 100644 --- a/gio/src/auto/converter_input_stream.rs +++ b/gio/src/auto/converter_input_stream.rs @@ -94,12 +94,7 @@ impl ConverterInputStreamBuilder { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ConverterInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait ConverterInputStreamExt: IsA + 'static { #[doc(alias = "g_converter_input_stream_get_converter")] #[doc(alias = "get_converter")] fn converter(&self) -> Converter { diff --git a/gio/src/auto/converter_output_stream.rs b/gio/src/auto/converter_output_stream.rs index 103f44b2b27f..c4d4c4482eb9 100644 --- a/gio/src/auto/converter_output_stream.rs +++ b/gio/src/auto/converter_output_stream.rs @@ -94,12 +94,7 @@ impl ConverterOutputStreamBuilder { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ConverterOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait ConverterOutputStreamExt: IsA + 'static { #[doc(alias = "g_converter_output_stream_get_converter")] #[doc(alias = "get_converter")] fn converter(&self) -> Converter { diff --git a/gio/src/auto/data_input_stream.rs b/gio/src/auto/data_input_stream.rs index 591288aae534..301f8903d8ef 100644 --- a/gio/src/auto/data_input_stream.rs +++ b/gio/src/auto/data_input_stream.rs @@ -107,12 +107,7 @@ impl DataInputStreamBuilder { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DataInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait DataInputStreamExt: IsA + 'static { #[doc(alias = "g_data_input_stream_get_byte_order")] #[doc(alias = "get_byte_order")] #[doc(alias = "byte-order")] diff --git a/gio/src/auto/data_output_stream.rs b/gio/src/auto/data_output_stream.rs index 42de12f35868..392beaf34f8f 100644 --- a/gio/src/auto/data_output_stream.rs +++ b/gio/src/auto/data_output_stream.rs @@ -92,12 +92,7 @@ impl DataOutputStreamBuilder { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DataOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait DataOutputStreamExt: IsA + 'static { #[doc(alias = "g_data_output_stream_get_byte_order")] #[doc(alias = "get_byte_order")] #[doc(alias = "byte-order")] diff --git a/gio/src/auto/datagram_based.rs b/gio/src/auto/datagram_based.rs index cc2b9c60c88b..8c20a6da9756 100644 --- a/gio/src/auto/datagram_based.rs +++ b/gio/src/auto/datagram_based.rs @@ -18,12 +18,7 @@ impl DatagramBased { pub const NONE: Option<&'static DatagramBased> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DatagramBasedExt: IsA + sealed::Sealed + 'static { +pub trait DatagramBasedExt: IsA + 'static { #[doc(alias = "g_datagram_based_condition_check")] fn condition_check(&self, condition: glib::IOCondition) -> glib::IOCondition { unsafe { diff --git a/gio/src/auto/dbus_interface.rs b/gio/src/auto/dbus_interface.rs index 1589bfbeb853..ff8d44c5eb0d 100644 --- a/gio/src/auto/dbus_interface.rs +++ b/gio/src/auto/dbus_interface.rs @@ -18,12 +18,7 @@ impl DBusInterface { pub const NONE: Option<&'static DBusInterface> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DBusInterfaceExt: IsA + sealed::Sealed + 'static { +pub trait DBusInterfaceExt: IsA + 'static { #[doc(alias = "g_dbus_interface_dup_object")] #[doc(alias = "dup_object")] fn get(&self) -> Option { diff --git a/gio/src/auto/dbus_interface_skeleton.rs b/gio/src/auto/dbus_interface_skeleton.rs index c5116b20268a..1acd9f8f522b 100644 --- a/gio/src/auto/dbus_interface_skeleton.rs +++ b/gio/src/auto/dbus_interface_skeleton.rs @@ -26,12 +26,7 @@ impl DBusInterfaceSkeleton { pub const NONE: Option<&'static DBusInterfaceSkeleton> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DBusInterfaceSkeletonExt: IsA + sealed::Sealed + 'static { +pub trait DBusInterfaceSkeletonExt: IsA + 'static { #[doc(alias = "g_dbus_interface_skeleton_export")] fn export(&self, connection: &DBusConnection, object_path: &str) -> Result<(), glib::Error> { unsafe { diff --git a/gio/src/auto/dbus_object.rs b/gio/src/auto/dbus_object.rs index 8f1ef1bb1461..d45c17d2f7e6 100644 --- a/gio/src/auto/dbus_object.rs +++ b/gio/src/auto/dbus_object.rs @@ -23,12 +23,7 @@ impl DBusObject { pub const NONE: Option<&'static DBusObject> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DBusObjectExt: IsA + sealed::Sealed + 'static { +pub trait DBusObjectExt: IsA + 'static { #[doc(alias = "g_dbus_object_get_interface")] #[doc(alias = "get_interface")] fn interface(&self, interface_name: &str) -> Option { diff --git a/gio/src/auto/dbus_object_manager.rs b/gio/src/auto/dbus_object_manager.rs index fc9e1dd2c84c..15395303ed73 100644 --- a/gio/src/auto/dbus_object_manager.rs +++ b/gio/src/auto/dbus_object_manager.rs @@ -23,12 +23,7 @@ impl DBusObjectManager { pub const NONE: Option<&'static DBusObjectManager> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DBusObjectManagerExt: IsA + sealed::Sealed + 'static { +pub trait DBusObjectManagerExt: IsA + 'static { #[doc(alias = "g_dbus_object_manager_get_interface")] #[doc(alias = "get_interface")] fn interface(&self, object_path: &str, interface_name: &str) -> Option { diff --git a/gio/src/auto/dbus_proxy.rs b/gio/src/auto/dbus_proxy.rs index cc626000acd6..e5d0d38711a9 100644 --- a/gio/src/auto/dbus_proxy.rs +++ b/gio/src/auto/dbus_proxy.rs @@ -271,12 +271,7 @@ impl DBusProxy { unsafe impl Send for DBusProxy {} unsafe impl Sync for DBusProxy {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DBusProxyExt: IsA + sealed::Sealed + 'static { +pub trait DBusProxyExt: IsA + 'static { #[doc(alias = "g_dbus_proxy_call")] fn call) + 'static>( &self, diff --git a/gio/src/auto/debug_controller.rs b/gio/src/auto/debug_controller.rs index 3e55daba7d61..3cc22b5d0488 100644 --- a/gio/src/auto/debug_controller.rs +++ b/gio/src/auto/debug_controller.rs @@ -23,12 +23,7 @@ impl DebugController { pub const NONE: Option<&'static DebugController> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DebugControllerExt: IsA + sealed::Sealed + 'static { +pub trait DebugControllerExt: IsA + 'static { #[doc(alias = "g_debug_controller_get_debug_enabled")] #[doc(alias = "get_debug_enabled")] #[doc(alias = "debug-enabled")] diff --git a/gio/src/auto/debug_controller_dbus.rs b/gio/src/auto/debug_controller_dbus.rs index 467ffd4ab58d..cc6be5da96b0 100644 --- a/gio/src/auto/debug_controller_dbus.rs +++ b/gio/src/auto/debug_controller_dbus.rs @@ -43,12 +43,7 @@ impl DebugControllerDBus { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DebugControllerDBusExt: IsA + sealed::Sealed + 'static { +pub trait DebugControllerDBusExt: IsA + 'static { #[doc(alias = "g_debug_controller_dbus_stop")] fn stop(&self) { unsafe { diff --git a/gio/src/auto/drive.rs b/gio/src/auto/drive.rs index 3a497b68c375..2ca861f67e02 100644 --- a/gio/src/auto/drive.rs +++ b/gio/src/auto/drive.rs @@ -26,12 +26,7 @@ impl Drive { pub const NONE: Option<&'static Drive> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DriveExt: IsA + sealed::Sealed + 'static { +pub trait DriveExt: IsA + 'static { #[doc(alias = "g_drive_can_eject")] fn can_eject(&self) -> bool { unsafe { from_glib(ffi::g_drive_can_eject(self.as_ref().to_glib_none().0)) } diff --git a/gio/src/auto/emblemed_icon.rs b/gio/src/auto/emblemed_icon.rs index 76b7d2448fdf..1f529e23bc0c 100644 --- a/gio/src/auto/emblemed_icon.rs +++ b/gio/src/auto/emblemed_icon.rs @@ -28,12 +28,7 @@ impl EmblemedIcon { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait EmblemedIconExt: IsA + sealed::Sealed + 'static { +pub trait EmblemedIconExt: IsA + 'static { #[doc(alias = "g_emblemed_icon_add_emblem")] fn add_emblem(&self, emblem: &Emblem) { unsafe { diff --git a/gio/src/auto/file.rs b/gio/src/auto/file.rs index d71a5c31b11c..25d396eae118 100644 --- a/gio/src/auto/file.rs +++ b/gio/src/auto/file.rs @@ -101,12 +101,7 @@ impl File { unsafe impl Send for File {} unsafe impl Sync for File {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileExt: IsA + sealed::Sealed + 'static { +pub trait FileExt: IsA + 'static { #[doc(alias = "g_file_append_to")] fn append_to( &self, diff --git a/gio/src/auto/file_enumerator.rs b/gio/src/auto/file_enumerator.rs index f24174051e7c..0ed8df045dcd 100644 --- a/gio/src/auto/file_enumerator.rs +++ b/gio/src/auto/file_enumerator.rs @@ -19,12 +19,7 @@ impl FileEnumerator { pub const NONE: Option<&'static FileEnumerator> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileEnumeratorExt: IsA + sealed::Sealed + 'static { +pub trait FileEnumeratorExt: IsA + 'static { #[doc(alias = "g_file_enumerator_close")] fn close(&self, cancellable: Option<&impl IsA>) -> Result<(), glib::Error> { unsafe { diff --git a/gio/src/auto/file_input_stream.rs b/gio/src/auto/file_input_stream.rs index 7d741a2b4a8e..606fd3128629 100644 --- a/gio/src/auto/file_input_stream.rs +++ b/gio/src/auto/file_input_stream.rs @@ -19,12 +19,7 @@ impl FileInputStream { pub const NONE: Option<&'static FileInputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait FileInputStreamExt: IsA + 'static { #[doc(alias = "g_file_input_stream_query_info")] fn query_info( &self, diff --git a/gio/src/auto/file_io_stream.rs b/gio/src/auto/file_io_stream.rs index f0907bdac203..083eb18fbc14 100644 --- a/gio/src/auto/file_io_stream.rs +++ b/gio/src/auto/file_io_stream.rs @@ -19,12 +19,7 @@ impl FileIOStream { pub const NONE: Option<&'static FileIOStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileIOStreamExt: IsA + sealed::Sealed + 'static { +pub trait FileIOStreamExt: IsA + 'static { #[doc(alias = "g_file_io_stream_get_etag")] #[doc(alias = "get_etag")] fn etag(&self) -> Option { diff --git a/gio/src/auto/file_monitor.rs b/gio/src/auto/file_monitor.rs index 81e8b2f1a957..4b90414ec5c8 100644 --- a/gio/src/auto/file_monitor.rs +++ b/gio/src/auto/file_monitor.rs @@ -23,12 +23,7 @@ impl FileMonitor { pub const NONE: Option<&'static FileMonitor> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileMonitorExt: IsA + sealed::Sealed + 'static { +pub trait FileMonitorExt: IsA + 'static { #[doc(alias = "g_file_monitor_cancel")] fn cancel(&self) -> bool { unsafe { from_glib(ffi::g_file_monitor_cancel(self.as_ref().to_glib_none().0)) } diff --git a/gio/src/auto/file_output_stream.rs b/gio/src/auto/file_output_stream.rs index 86fa7c151dc6..0be40ad6fe14 100644 --- a/gio/src/auto/file_output_stream.rs +++ b/gio/src/auto/file_output_stream.rs @@ -19,12 +19,7 @@ impl FileOutputStream { pub const NONE: Option<&'static FileOutputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait FileOutputStreamExt: IsA + 'static { #[doc(alias = "g_file_output_stream_get_etag")] #[doc(alias = "get_etag")] fn etag(&self) -> Option { diff --git a/gio/src/auto/filter_input_stream.rs b/gio/src/auto/filter_input_stream.rs index cc996f1e2072..34a4760c8216 100644 --- a/gio/src/auto/filter_input_stream.rs +++ b/gio/src/auto/filter_input_stream.rs @@ -23,12 +23,7 @@ impl FilterInputStream { pub const NONE: Option<&'static FilterInputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FilterInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait FilterInputStreamExt: IsA + 'static { #[doc(alias = "g_filter_input_stream_get_base_stream")] #[doc(alias = "get_base_stream")] #[doc(alias = "base-stream")] diff --git a/gio/src/auto/filter_output_stream.rs b/gio/src/auto/filter_output_stream.rs index 41c2eb3cf113..7efac56c0e66 100644 --- a/gio/src/auto/filter_output_stream.rs +++ b/gio/src/auto/filter_output_stream.rs @@ -23,12 +23,7 @@ impl FilterOutputStream { pub const NONE: Option<&'static FilterOutputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FilterOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait FilterOutputStreamExt: IsA + 'static { #[doc(alias = "g_filter_output_stream_get_base_stream")] #[doc(alias = "get_base_stream")] #[doc(alias = "base-stream")] diff --git a/gio/src/auto/icon.rs b/gio/src/auto/icon.rs index 34b6228642ae..596b692364ec 100644 --- a/gio/src/auto/icon.rs +++ b/gio/src/auto/icon.rs @@ -37,12 +37,7 @@ impl Icon { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait IconExt: IsA + sealed::Sealed + 'static { +pub trait IconExt: IsA + 'static { #[doc(alias = "g_icon_equal")] fn equal(&self, icon2: Option<&impl IsA>) -> bool { unsafe { diff --git a/gio/src/auto/inet_address.rs b/gio/src/auto/inet_address.rs index 817c3df43751..c41d8978105a 100644 --- a/gio/src/auto/inet_address.rs +++ b/gio/src/auto/inet_address.rs @@ -49,12 +49,7 @@ impl std::fmt::Display for InetAddress { unsafe impl Send for InetAddress {} unsafe impl Sync for InetAddress {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait InetAddressExt: IsA + sealed::Sealed + 'static { +pub trait InetAddressExt: IsA + 'static { #[doc(alias = "g_inet_address_equal")] fn equal(&self, other_address: &impl IsA) -> bool { unsafe { diff --git a/gio/src/auto/inet_address_mask.rs b/gio/src/auto/inet_address_mask.rs index ebf9692c3fcd..cdc41af6f440 100644 --- a/gio/src/auto/inet_address_mask.rs +++ b/gio/src/auto/inet_address_mask.rs @@ -62,12 +62,7 @@ impl std::fmt::Display for InetAddressMask { unsafe impl Send for InetAddressMask {} unsafe impl Sync for InetAddressMask {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait InetAddressMaskExt: IsA + sealed::Sealed + 'static { +pub trait InetAddressMaskExt: IsA + 'static { #[doc(alias = "g_inet_address_mask_equal")] fn equal(&self, mask2: &impl IsA) -> bool { unsafe { diff --git a/gio/src/auto/inet_socket_address.rs b/gio/src/auto/inet_socket_address.rs index 963582719471..a474c26a05b6 100644 --- a/gio/src/auto/inet_socket_address.rs +++ b/gio/src/auto/inet_socket_address.rs @@ -44,12 +44,7 @@ impl InetSocketAddress { unsafe impl Send for InetSocketAddress {} unsafe impl Sync for InetSocketAddress {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait InetSocketAddressExt: IsA + sealed::Sealed + 'static { +pub trait InetSocketAddressExt: IsA + 'static { #[doc(alias = "g_inet_socket_address_get_address")] #[doc(alias = "get_address")] fn address(&self) -> InetAddress { diff --git a/gio/src/auto/initable.rs b/gio/src/auto/initable.rs index 1434b7597c17..e8524cfb1185 100644 --- a/gio/src/auto/initable.rs +++ b/gio/src/auto/initable.rs @@ -18,12 +18,7 @@ impl Initable { pub const NONE: Option<&'static Initable> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait InitableExt: IsA + sealed::Sealed + 'static { +pub trait InitableExt: IsA + 'static { #[doc(alias = "g_initable_init")] unsafe fn init(&self, cancellable: Option<&impl IsA>) -> Result<(), glib::Error> { let mut error = std::ptr::null_mut(); diff --git a/gio/src/auto/input_stream.rs b/gio/src/auto/input_stream.rs index 13291bc4c41e..bac40542b5ad 100644 --- a/gio/src/auto/input_stream.rs +++ b/gio/src/auto/input_stream.rs @@ -19,12 +19,7 @@ impl InputStream { pub const NONE: Option<&'static InputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait InputStreamExt: IsA + sealed::Sealed + 'static { +pub trait InputStreamExt: IsA + 'static { #[doc(alias = "g_input_stream_clear_pending")] fn clear_pending(&self) { unsafe { diff --git a/gio/src/auto/io_stream.rs b/gio/src/auto/io_stream.rs index 341b32e7be91..7cdc957bf934 100644 --- a/gio/src/auto/io_stream.rs +++ b/gio/src/auto/io_stream.rs @@ -23,12 +23,7 @@ impl IOStream { pub const NONE: Option<&'static IOStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait IOStreamExt: IsA + sealed::Sealed + 'static { +pub trait IOStreamExt: IsA + 'static { #[doc(alias = "g_io_stream_clear_pending")] fn clear_pending(&self) { unsafe { diff --git a/gio/src/auto/list_model.rs b/gio/src/auto/list_model.rs index 3b69585c56f4..4e2768aa67b2 100644 --- a/gio/src/auto/list_model.rs +++ b/gio/src/auto/list_model.rs @@ -23,12 +23,7 @@ impl ListModel { pub const NONE: Option<&'static ListModel> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ListModelExt: IsA + sealed::Sealed + 'static { +pub trait ListModelExt: IsA + 'static { #[doc(alias = "g_list_model_get_item_type")] #[doc(alias = "get_item_type")] fn item_type(&self) -> glib::types::Type { diff --git a/gio/src/auto/loadable_icon.rs b/gio/src/auto/loadable_icon.rs index 3530b52e6413..c21e1c18ddf6 100644 --- a/gio/src/auto/loadable_icon.rs +++ b/gio/src/auto/loadable_icon.rs @@ -19,12 +19,7 @@ impl LoadableIcon { pub const NONE: Option<&'static LoadableIcon> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait LoadableIconExt: IsA + sealed::Sealed + 'static { +pub trait LoadableIconExt: IsA + 'static { #[doc(alias = "g_loadable_icon_load")] fn load( &self, diff --git a/gio/src/auto/memory_input_stream.rs b/gio/src/auto/memory_input_stream.rs index dff9f88ae248..f9002476ad3c 100644 --- a/gio/src/auto/memory_input_stream.rs +++ b/gio/src/auto/memory_input_stream.rs @@ -40,12 +40,7 @@ impl Default for MemoryInputStream { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MemoryInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait MemoryInputStreamExt: IsA + 'static { #[doc(alias = "g_memory_input_stream_add_bytes")] fn add_bytes(&self, bytes: &glib::Bytes) { unsafe { diff --git a/gio/src/auto/memory_monitor.rs b/gio/src/auto/memory_monitor.rs index 712a4594c237..6c2bf02e0266 100644 --- a/gio/src/auto/memory_monitor.rs +++ b/gio/src/auto/memory_monitor.rs @@ -28,12 +28,7 @@ impl MemoryMonitor { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MemoryMonitorExt: IsA + sealed::Sealed + 'static { +pub trait MemoryMonitorExt: IsA + 'static { #[cfg(feature = "v2_64")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_64")))] #[doc(alias = "low-memory-warning")] diff --git a/gio/src/auto/memory_output_stream.rs b/gio/src/auto/memory_output_stream.rs index b36dc3700a7e..0672ff4aaaf0 100644 --- a/gio/src/auto/memory_output_stream.rs +++ b/gio/src/auto/memory_output_stream.rs @@ -30,12 +30,7 @@ impl MemoryOutputStream { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MemoryOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait MemoryOutputStreamExt: IsA + 'static { #[doc(alias = "g_memory_output_stream_get_data_size")] #[doc(alias = "get_data_size")] #[doc(alias = "data-size")] diff --git a/gio/src/auto/menu_attribute_iter.rs b/gio/src/auto/menu_attribute_iter.rs index 2d1c90726cf9..872e422253d3 100644 --- a/gio/src/auto/menu_attribute_iter.rs +++ b/gio/src/auto/menu_attribute_iter.rs @@ -18,12 +18,7 @@ impl MenuAttributeIter { pub const NONE: Option<&'static MenuAttributeIter> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MenuAttributeIterExt: IsA + sealed::Sealed + 'static { +pub trait MenuAttributeIterExt: IsA + 'static { #[doc(alias = "g_menu_attribute_iter_get_next")] #[doc(alias = "get_next")] fn next(&self) -> Option<(glib::GString, glib::Variant)> { diff --git a/gio/src/auto/menu_link_iter.rs b/gio/src/auto/menu_link_iter.rs index 8e9fabd630ab..e02c058c8d34 100644 --- a/gio/src/auto/menu_link_iter.rs +++ b/gio/src/auto/menu_link_iter.rs @@ -18,12 +18,7 @@ impl MenuLinkIter { pub const NONE: Option<&'static MenuLinkIter> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MenuLinkIterExt: IsA + sealed::Sealed + 'static { +pub trait MenuLinkIterExt: IsA + 'static { #[doc(alias = "g_menu_link_iter_get_next")] #[doc(alias = "get_next")] fn next(&self) -> Option<(glib::GString, MenuModel)> { diff --git a/gio/src/auto/menu_model.rs b/gio/src/auto/menu_model.rs index 438dba2193be..7a2b2f0742f6 100644 --- a/gio/src/auto/menu_model.rs +++ b/gio/src/auto/menu_model.rs @@ -23,12 +23,7 @@ impl MenuModel { pub const NONE: Option<&'static MenuModel> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MenuModelExt: IsA + sealed::Sealed + 'static { +pub trait MenuModelExt: IsA + 'static { //#[doc(alias = "g_menu_model_get_item_attribute")] //#[doc(alias = "get_item_attribute")] //fn is_item_attribute(&self, item_index: i32, attribute: &str, format_string: &str, : /*Unknown conversion*//*Unimplemented*/Basic: VarArgs) -> bool { diff --git a/gio/src/auto/mount.rs b/gio/src/auto/mount.rs index 91d1b7cc7877..4e102fa9661c 100644 --- a/gio/src/auto/mount.rs +++ b/gio/src/auto/mount.rs @@ -26,12 +26,7 @@ impl Mount { pub const NONE: Option<&'static Mount> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MountExt: IsA + sealed::Sealed + 'static { +pub trait MountExt: IsA + 'static { #[doc(alias = "g_mount_can_eject")] fn can_eject(&self) -> bool { unsafe { from_glib(ffi::g_mount_can_eject(self.as_ref().to_glib_none().0)) } diff --git a/gio/src/auto/mount_operation.rs b/gio/src/auto/mount_operation.rs index 399c08ea5bb4..8799d7de4f1a 100644 --- a/gio/src/auto/mount_operation.rs +++ b/gio/src/auto/mount_operation.rs @@ -34,12 +34,7 @@ impl Default for MountOperation { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait MountOperationExt: IsA + sealed::Sealed + 'static { +pub trait MountOperationExt: IsA + 'static { #[doc(alias = "g_mount_operation_get_anonymous")] #[doc(alias = "get_anonymous")] #[doc(alias = "anonymous")] diff --git a/gio/src/auto/network_address.rs b/gio/src/auto/network_address.rs index ac24907a47b5..40602965fd4d 100644 --- a/gio/src/auto/network_address.rs +++ b/gio/src/auto/network_address.rs @@ -62,12 +62,7 @@ impl NetworkAddress { unsafe impl Send for NetworkAddress {} unsafe impl Sync for NetworkAddress {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait NetworkAddressExt: IsA + sealed::Sealed + 'static { +pub trait NetworkAddressExt: IsA + 'static { #[doc(alias = "g_network_address_get_hostname")] #[doc(alias = "get_hostname")] fn hostname(&self) -> glib::GString { diff --git a/gio/src/auto/network_monitor.rs b/gio/src/auto/network_monitor.rs index 5abff66f044d..abad9d7e39af 100644 --- a/gio/src/auto/network_monitor.rs +++ b/gio/src/auto/network_monitor.rs @@ -30,12 +30,7 @@ impl NetworkMonitor { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait NetworkMonitorExt: IsA + sealed::Sealed + 'static { +pub trait NetworkMonitorExt: IsA + 'static { #[doc(alias = "g_network_monitor_can_reach")] fn can_reach( &self, diff --git a/gio/src/auto/network_service.rs b/gio/src/auto/network_service.rs index d6de66b393b1..1e009f68006d 100644 --- a/gio/src/auto/network_service.rs +++ b/gio/src/auto/network_service.rs @@ -34,12 +34,7 @@ impl NetworkService { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait NetworkServiceExt: IsA + sealed::Sealed + 'static { +pub trait NetworkServiceExt: IsA + 'static { #[doc(alias = "g_network_service_get_domain")] #[doc(alias = "get_domain")] fn domain(&self) -> glib::GString { diff --git a/gio/src/auto/output_stream.rs b/gio/src/auto/output_stream.rs index 720fd6f75a84..7f8edecba198 100644 --- a/gio/src/auto/output_stream.rs +++ b/gio/src/auto/output_stream.rs @@ -19,12 +19,7 @@ impl OutputStream { pub const NONE: Option<&'static OutputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait OutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait OutputStreamExt: IsA + 'static { #[doc(alias = "g_output_stream_clear_pending")] fn clear_pending(&self) { unsafe { diff --git a/gio/src/auto/permission.rs b/gio/src/auto/permission.rs index cc992f05e1cb..115150ce9961 100644 --- a/gio/src/auto/permission.rs +++ b/gio/src/auto/permission.rs @@ -23,12 +23,7 @@ impl Permission { pub const NONE: Option<&'static Permission> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PermissionExt: IsA + sealed::Sealed + 'static { +pub trait PermissionExt: IsA + 'static { #[doc(alias = "g_permission_acquire")] fn acquire(&self, cancellable: Option<&impl IsA>) -> Result<(), glib::Error> { unsafe { diff --git a/gio/src/auto/pollable_input_stream.rs b/gio/src/auto/pollable_input_stream.rs index a2d59a074d78..ba198dbf6d0e 100644 --- a/gio/src/auto/pollable_input_stream.rs +++ b/gio/src/auto/pollable_input_stream.rs @@ -18,12 +18,7 @@ impl PollableInputStream { pub const NONE: Option<&'static PollableInputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PollableInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait PollableInputStreamExt: IsA + 'static { #[doc(alias = "g_pollable_input_stream_can_poll")] fn can_poll(&self) -> bool { unsafe { diff --git a/gio/src/auto/pollable_output_stream.rs b/gio/src/auto/pollable_output_stream.rs index c9d75d5c5e6f..d1997df4b61e 100644 --- a/gio/src/auto/pollable_output_stream.rs +++ b/gio/src/auto/pollable_output_stream.rs @@ -18,12 +18,7 @@ impl PollableOutputStream { pub const NONE: Option<&'static PollableOutputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PollableOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait PollableOutputStreamExt: IsA + 'static { #[doc(alias = "g_pollable_output_stream_can_poll")] fn can_poll(&self) -> bool { unsafe { diff --git a/gio/src/auto/power_profile_monitor.rs b/gio/src/auto/power_profile_monitor.rs index 988d2b298238..0f9dbb44e4fe 100644 --- a/gio/src/auto/power_profile_monitor.rs +++ b/gio/src/auto/power_profile_monitor.rs @@ -29,12 +29,7 @@ impl PowerProfileMonitor { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PowerProfileMonitorExt: IsA + sealed::Sealed + 'static { +pub trait PowerProfileMonitorExt: IsA + 'static { #[doc(alias = "g_power_profile_monitor_get_power_saver_enabled")] #[doc(alias = "get_power_saver_enabled")] #[doc(alias = "power-saver-enabled")] diff --git a/gio/src/auto/proxy.rs b/gio/src/auto/proxy.rs index e8b8bf190de4..fdf44fcbecab 100644 --- a/gio/src/auto/proxy.rs +++ b/gio/src/auto/proxy.rs @@ -29,12 +29,7 @@ impl Proxy { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ProxyExt: IsA + sealed::Sealed + 'static { +pub trait ProxyExt: IsA + 'static { #[doc(alias = "g_proxy_connect")] fn connect( &self, diff --git a/gio/src/auto/proxy_address.rs b/gio/src/auto/proxy_address.rs index 99c7eef8a8f9..86d609ad3930 100644 --- a/gio/src/auto/proxy_address.rs +++ b/gio/src/auto/proxy_address.rs @@ -45,12 +45,7 @@ impl ProxyAddress { unsafe impl Send for ProxyAddress {} unsafe impl Sync for ProxyAddress {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ProxyAddressExt: IsA + sealed::Sealed + 'static { +pub trait ProxyAddressExt: IsA + 'static { #[doc(alias = "g_proxy_address_get_destination_hostname")] #[doc(alias = "get_destination_hostname")] #[doc(alias = "destination-hostname")] diff --git a/gio/src/auto/proxy_resolver.rs b/gio/src/auto/proxy_resolver.rs index 4507e6a13a47..9a25a8fdc48e 100644 --- a/gio/src/auto/proxy_resolver.rs +++ b/gio/src/auto/proxy_resolver.rs @@ -26,12 +26,7 @@ impl ProxyResolver { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ProxyResolverExt: IsA + sealed::Sealed + 'static { +pub trait ProxyResolverExt: IsA + 'static { #[doc(alias = "g_proxy_resolver_is_supported")] fn is_supported(&self) -> bool { unsafe { diff --git a/gio/src/auto/remote_action_group.rs b/gio/src/auto/remote_action_group.rs index da44330a2e32..5bc0912db83c 100644 --- a/gio/src/auto/remote_action_group.rs +++ b/gio/src/auto/remote_action_group.rs @@ -18,12 +18,7 @@ impl RemoteActionGroup { pub const NONE: Option<&'static RemoteActionGroup> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait RemoteActionGroupExt: IsA + sealed::Sealed + 'static { +pub trait RemoteActionGroupExt: IsA + 'static { #[doc(alias = "g_remote_action_group_activate_action_full")] fn activate_action_full( &self, diff --git a/gio/src/auto/resolver.rs b/gio/src/auto/resolver.rs index dc3a7e7d769c..bc52e161a429 100644 --- a/gio/src/auto/resolver.rs +++ b/gio/src/auto/resolver.rs @@ -43,12 +43,7 @@ impl Resolver { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ResolverExt: IsA + sealed::Sealed + 'static { +pub trait ResolverExt: IsA + 'static { #[cfg(feature = "v2_78")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_78")))] #[doc(alias = "g_resolver_get_timeout")] diff --git a/gio/src/auto/seekable.rs b/gio/src/auto/seekable.rs index fd12537c82cd..126f7c91aaee 100644 --- a/gio/src/auto/seekable.rs +++ b/gio/src/auto/seekable.rs @@ -18,12 +18,7 @@ impl Seekable { pub const NONE: Option<&'static Seekable> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SeekableExt: IsA + sealed::Sealed + 'static { +pub trait SeekableExt: IsA + 'static { #[doc(alias = "g_seekable_can_seek")] fn can_seek(&self) -> bool { unsafe { from_glib(ffi::g_seekable_can_seek(self.as_ref().to_glib_none().0)) } diff --git a/gio/src/auto/settings.rs b/gio/src/auto/settings.rs index d63c64ba69b5..e2ce6516e13e 100644 --- a/gio/src/auto/settings.rs +++ b/gio/src/auto/settings.rs @@ -98,12 +98,7 @@ impl Settings { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SettingsExt: IsA + sealed::Sealed + 'static { +pub trait SettingsExt: IsA + 'static { #[doc(alias = "g_settings_apply")] fn apply(&self) { unsafe { diff --git a/gio/src/auto/settings_backend.rs b/gio/src/auto/settings_backend.rs index 24836392e4bc..9ece1a1b5733 100644 --- a/gio/src/auto/settings_backend.rs +++ b/gio/src/auto/settings_backend.rs @@ -30,12 +30,7 @@ impl SettingsBackend { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SettingsBackendExt: IsA + sealed::Sealed + 'static { +pub trait SettingsBackendExt: IsA + 'static { //#[doc(alias = "g_settings_backend_changed")] //fn changed(&self, key: &str, origin_tag: /*Unimplemented*/Option) { // unsafe { TODO: call ffi:g_settings_backend_changed() } diff --git a/gio/src/auto/simple_proxy_resolver.rs b/gio/src/auto/simple_proxy_resolver.rs index 2226798f4603..8615d6c8f18f 100644 --- a/gio/src/auto/simple_proxy_resolver.rs +++ b/gio/src/auto/simple_proxy_resolver.rs @@ -23,12 +23,7 @@ impl SimpleProxyResolver { pub const NONE: Option<&'static SimpleProxyResolver> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SimpleProxyResolverExt: IsA + sealed::Sealed + 'static { +pub trait SimpleProxyResolverExt: IsA + 'static { #[doc(alias = "g_simple_proxy_resolver_set_default_proxy")] #[doc(alias = "default-proxy")] fn set_default_proxy(&self, default_proxy: Option<&str>) { diff --git a/gio/src/auto/socket.rs b/gio/src/auto/socket.rs index 9d3a3d552018..4bbce4a43886 100644 --- a/gio/src/auto/socket.rs +++ b/gio/src/auto/socket.rs @@ -48,12 +48,7 @@ impl Socket { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketExt: IsA + sealed::Sealed + 'static { +pub trait SocketExt: IsA + 'static { #[doc(alias = "g_socket_accept")] fn accept(&self, cancellable: Option<&impl IsA>) -> Result { unsafe { diff --git a/gio/src/auto/socket_address.rs b/gio/src/auto/socket_address.rs index e170c3a22a08..8fd58a5291f9 100644 --- a/gio/src/auto/socket_address.rs +++ b/gio/src/auto/socket_address.rs @@ -32,12 +32,7 @@ impl SocketAddress { unsafe impl Send for SocketAddress {} unsafe impl Sync for SocketAddress {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketAddressExt: IsA + sealed::Sealed + 'static { +pub trait SocketAddressExt: IsA + 'static { #[doc(alias = "g_socket_address_get_family")] #[doc(alias = "get_family")] fn family(&self) -> SocketFamily { diff --git a/gio/src/auto/socket_address_enumerator.rs b/gio/src/auto/socket_address_enumerator.rs index e2e9fbad873d..963058ac53a0 100644 --- a/gio/src/auto/socket_address_enumerator.rs +++ b/gio/src/auto/socket_address_enumerator.rs @@ -19,14 +19,7 @@ impl SocketAddressEnumerator { pub const NONE: Option<&'static SocketAddressEnumerator> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketAddressEnumeratorExt: - IsA + sealed::Sealed + 'static -{ +pub trait SocketAddressEnumeratorExt: IsA + 'static { #[doc(alias = "g_socket_address_enumerator_next")] fn next( &self, diff --git a/gio/src/auto/socket_client.rs b/gio/src/auto/socket_client.rs index 7cba120c01bc..cc0388d45cc6 100644 --- a/gio/src/auto/socket_client.rs +++ b/gio/src/auto/socket_client.rs @@ -39,12 +39,7 @@ impl Default for SocketClient { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketClientExt: IsA + sealed::Sealed + 'static { +pub trait SocketClientExt: IsA + 'static { #[doc(alias = "g_socket_client_add_application_proxy")] fn add_application_proxy(&self, protocol: &str) { unsafe { diff --git a/gio/src/auto/socket_connectable.rs b/gio/src/auto/socket_connectable.rs index ec2bc7d20ffa..86cfaa148368 100644 --- a/gio/src/auto/socket_connectable.rs +++ b/gio/src/auto/socket_connectable.rs @@ -18,12 +18,7 @@ impl SocketConnectable { pub const NONE: Option<&'static SocketConnectable> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketConnectableExt: IsA + sealed::Sealed + 'static { +pub trait SocketConnectableExt: IsA + 'static { #[doc(alias = "g_socket_connectable_enumerate")] fn enumerate(&self) -> SocketAddressEnumerator { unsafe { diff --git a/gio/src/auto/socket_connection.rs b/gio/src/auto/socket_connection.rs index bbbd5d9d9c09..7933d6dc3877 100644 --- a/gio/src/auto/socket_connection.rs +++ b/gio/src/auto/socket_connection.rs @@ -53,12 +53,7 @@ impl SocketConnection { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketConnectionExt: IsA + sealed::Sealed + 'static { +pub trait SocketConnectionExt: IsA + 'static { #[doc(alias = "g_socket_connection_connect")] fn connect( &self, diff --git a/gio/src/auto/socket_control_message.rs b/gio/src/auto/socket_control_message.rs index cf2b1f2e9a2f..e4a00cb0166d 100644 --- a/gio/src/auto/socket_control_message.rs +++ b/gio/src/auto/socket_control_message.rs @@ -31,12 +31,7 @@ impl SocketControlMessage { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketControlMessageExt: IsA + sealed::Sealed + 'static { +pub trait SocketControlMessageExt: IsA + 'static { #[doc(alias = "g_socket_control_message_get_level")] #[doc(alias = "get_level")] fn level(&self) -> i32 { diff --git a/gio/src/auto/socket_listener.rs b/gio/src/auto/socket_listener.rs index 78fafdae5649..400f3f8b024d 100644 --- a/gio/src/auto/socket_listener.rs +++ b/gio/src/auto/socket_listener.rs @@ -37,12 +37,7 @@ impl Default for SocketListener { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketListenerExt: IsA + sealed::Sealed + 'static { +pub trait SocketListenerExt: IsA + 'static { #[doc(alias = "g_socket_listener_accept")] fn accept( &self, diff --git a/gio/src/auto/socket_service.rs b/gio/src/auto/socket_service.rs index 095de58432dc..cfa00177c9a3 100644 --- a/gio/src/auto/socket_service.rs +++ b/gio/src/auto/socket_service.rs @@ -34,12 +34,7 @@ impl Default for SocketService { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketServiceExt: IsA + sealed::Sealed + 'static { +pub trait SocketServiceExt: IsA + 'static { #[doc(alias = "g_socket_service_is_active")] #[doc(alias = "active")] fn is_active(&self) -> bool { diff --git a/gio/src/auto/tcp_connection.rs b/gio/src/auto/tcp_connection.rs index 6255b795227a..84709a4ca78e 100644 --- a/gio/src/auto/tcp_connection.rs +++ b/gio/src/auto/tcp_connection.rs @@ -23,12 +23,7 @@ impl TcpConnection { pub const NONE: Option<&'static TcpConnection> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TcpConnectionExt: IsA + sealed::Sealed + 'static { +pub trait TcpConnectionExt: IsA + 'static { #[doc(alias = "g_tcp_connection_get_graceful_disconnect")] #[doc(alias = "get_graceful_disconnect")] #[doc(alias = "graceful-disconnect")] diff --git a/gio/src/auto/threaded_socket_service.rs b/gio/src/auto/threaded_socket_service.rs index b6a55823b977..b09edbe2c8a5 100644 --- a/gio/src/auto/threaded_socket_service.rs +++ b/gio/src/auto/threaded_socket_service.rs @@ -23,12 +23,7 @@ impl ThreadedSocketService { pub const NONE: Option<&'static ThreadedSocketService> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ThreadedSocketServiceExt: IsA + sealed::Sealed + 'static { +pub trait ThreadedSocketServiceExt: IsA + 'static { #[doc(alias = "max-threads")] fn max_threads(&self) -> i32 { ObjectExt::property(self.as_ref(), "max-threads") diff --git a/gio/src/auto/tls_backend.rs b/gio/src/auto/tls_backend.rs index 7bf9a33cb862..195f25c9c94e 100644 --- a/gio/src/auto/tls_backend.rs +++ b/gio/src/auto/tls_backend.rs @@ -25,12 +25,7 @@ impl TlsBackend { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsBackendExt: IsA + sealed::Sealed + 'static { +pub trait TlsBackendExt: IsA + 'static { #[doc(alias = "g_tls_backend_get_certificate_type")] #[doc(alias = "get_certificate_type")] fn certificate_type(&self) -> glib::types::Type { diff --git a/gio/src/auto/tls_certificate.rs b/gio/src/auto/tls_certificate.rs index 0468cebcef4a..c41c8827a039 100644 --- a/gio/src/auto/tls_certificate.rs +++ b/gio/src/auto/tls_certificate.rs @@ -165,12 +165,7 @@ impl TlsCertificate { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsCertificateExt: IsA + sealed::Sealed + 'static { +pub trait TlsCertificateExt: IsA + 'static { #[cfg(feature = "v2_70")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_70")))] #[doc(alias = "g_tls_certificate_get_dns_names")] diff --git a/gio/src/auto/tls_client_connection.rs b/gio/src/auto/tls_client_connection.rs index de68b3038ce9..5a9a1b07d164 100644 --- a/gio/src/auto/tls_client_connection.rs +++ b/gio/src/auto/tls_client_connection.rs @@ -44,12 +44,7 @@ impl TlsClientConnection { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsClientConnectionExt: IsA + sealed::Sealed + 'static { +pub trait TlsClientConnectionExt: IsA + 'static { #[doc(alias = "g_tls_client_connection_copy_session_state")] fn copy_session_state(&self, source: &impl IsA) { unsafe { diff --git a/gio/src/auto/tls_connection.rs b/gio/src/auto/tls_connection.rs index 6ce020d45f97..7027589ffb6c 100644 --- a/gio/src/auto/tls_connection.rs +++ b/gio/src/auto/tls_connection.rs @@ -30,12 +30,7 @@ impl TlsConnection { pub const NONE: Option<&'static TlsConnection> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsConnectionExt: IsA + sealed::Sealed + 'static { +pub trait TlsConnectionExt: IsA + 'static { #[doc(alias = "g_tls_connection_emit_accept_certificate")] fn emit_accept_certificate( &self, diff --git a/gio/src/auto/tls_database.rs b/gio/src/auto/tls_database.rs index db1dd47370a1..1e45cd81d0c5 100644 --- a/gio/src/auto/tls_database.rs +++ b/gio/src/auto/tls_database.rs @@ -22,12 +22,7 @@ impl TlsDatabase { pub const NONE: Option<&'static TlsDatabase> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsDatabaseExt: IsA + sealed::Sealed + 'static { +pub trait TlsDatabaseExt: IsA + 'static { #[doc(alias = "g_tls_database_create_certificate_handle")] fn create_certificate_handle( &self, diff --git a/gio/src/auto/tls_file_database.rs b/gio/src/auto/tls_file_database.rs index a7cc3753ddde..878326074e3a 100644 --- a/gio/src/auto/tls_file_database.rs +++ b/gio/src/auto/tls_file_database.rs @@ -36,12 +36,7 @@ impl TlsFileDatabase { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsFileDatabaseExt: IsA + sealed::Sealed + 'static { +pub trait TlsFileDatabaseExt: IsA + 'static { fn anchors(&self) -> Option { ObjectExt::property(self.as_ref(), "anchors") } diff --git a/gio/src/auto/tls_interaction.rs b/gio/src/auto/tls_interaction.rs index 0c902f69fe1c..964f36184320 100644 --- a/gio/src/auto/tls_interaction.rs +++ b/gio/src/auto/tls_interaction.rs @@ -22,12 +22,7 @@ impl TlsInteraction { pub const NONE: Option<&'static TlsInteraction> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsInteractionExt: IsA + sealed::Sealed + 'static { +pub trait TlsInteractionExt: IsA + 'static { #[doc(alias = "g_tls_interaction_ask_password")] fn ask_password( &self, diff --git a/gio/src/auto/tls_password.rs b/gio/src/auto/tls_password.rs index c832a8ad2788..c57356bbee89 100644 --- a/gio/src/auto/tls_password.rs +++ b/gio/src/auto/tls_password.rs @@ -33,12 +33,7 @@ impl TlsPassword { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsPasswordExt: IsA + sealed::Sealed + 'static { +pub trait TlsPasswordExt: IsA + 'static { #[doc(alias = "g_tls_password_get_description")] #[doc(alias = "get_description")] fn description(&self) -> glib::GString { diff --git a/gio/src/auto/tls_server_connection.rs b/gio/src/auto/tls_server_connection.rs index bbd8119c5242..6b2a33b42f33 100644 --- a/gio/src/auto/tls_server_connection.rs +++ b/gio/src/auto/tls_server_connection.rs @@ -43,12 +43,7 @@ impl TlsServerConnection { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsServerConnectionExt: IsA + sealed::Sealed + 'static { +pub trait TlsServerConnectionExt: IsA + 'static { #[doc(alias = "authentication-mode")] fn authentication_mode(&self) -> TlsAuthenticationMode { ObjectExt::property(self.as_ref(), "authentication-mode") diff --git a/gio/src/auto/unix_credentials_message.rs b/gio/src/auto/unix_credentials_message.rs index ccd645c91d8c..fd0366fe0e47 100644 --- a/gio/src/auto/unix_credentials_message.rs +++ b/gio/src/auto/unix_credentials_message.rs @@ -48,14 +48,7 @@ impl Default for UnixCredentialsMessage { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixCredentialsMessageExt: - IsA + sealed::Sealed + 'static -{ +pub trait UnixCredentialsMessageExt: IsA + 'static { #[doc(alias = "g_unix_credentials_message_get_credentials")] #[doc(alias = "get_credentials")] fn credentials(&self) -> Credentials { diff --git a/gio/src/auto/unix_fd_list.rs b/gio/src/auto/unix_fd_list.rs index 704b10ea53fe..70c84363f2cf 100644 --- a/gio/src/auto/unix_fd_list.rs +++ b/gio/src/auto/unix_fd_list.rs @@ -29,12 +29,7 @@ impl Default for UnixFDList { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixFDListExt: IsA + sealed::Sealed + 'static { +pub trait UnixFDListExt: IsA + 'static { #[doc(alias = "g_unix_fd_list_get_length")] #[doc(alias = "get_length")] fn length(&self) -> i32 { diff --git a/gio/src/auto/unix_fd_message.rs b/gio/src/auto/unix_fd_message.rs index b5cf16c9b0f6..3d90f4a338af 100644 --- a/gio/src/auto/unix_fd_message.rs +++ b/gio/src/auto/unix_fd_message.rs @@ -40,12 +40,7 @@ impl Default for UnixFDMessage { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixFDMessageExt: IsA + sealed::Sealed + 'static { +pub trait UnixFDMessageExt: IsA + 'static { #[doc(alias = "g_unix_fd_message_get_fd_list")] #[doc(alias = "get_fd_list")] #[doc(alias = "fd-list")] diff --git a/gio/src/auto/unix_input_stream.rs b/gio/src/auto/unix_input_stream.rs index a014b0578d56..43c455572ca7 100644 --- a/gio/src/auto/unix_input_stream.rs +++ b/gio/src/auto/unix_input_stream.rs @@ -18,12 +18,7 @@ impl UnixInputStream { pub const NONE: Option<&'static UnixInputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixInputStreamExt: IsA + sealed::Sealed + 'static { +pub trait UnixInputStreamExt: IsA + 'static { #[doc(alias = "g_unix_input_stream_get_close_fd")] #[doc(alias = "get_close_fd")] #[doc(alias = "close-fd")] diff --git a/gio/src/auto/unix_output_stream.rs b/gio/src/auto/unix_output_stream.rs index 0c45da35477f..f7cba6395d7b 100644 --- a/gio/src/auto/unix_output_stream.rs +++ b/gio/src/auto/unix_output_stream.rs @@ -18,12 +18,7 @@ impl UnixOutputStream { pub const NONE: Option<&'static UnixOutputStream> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixOutputStreamExt: IsA + sealed::Sealed + 'static { +pub trait UnixOutputStreamExt: IsA + 'static { #[doc(alias = "g_unix_output_stream_get_close_fd")] #[doc(alias = "get_close_fd")] #[doc(alias = "close-fd")] diff --git a/gio/src/auto/unix_socket_address.rs b/gio/src/auto/unix_socket_address.rs index 545560e2c6b0..a79adf9e0fd4 100644 --- a/gio/src/auto/unix_socket_address.rs +++ b/gio/src/auto/unix_socket_address.rs @@ -37,12 +37,7 @@ impl UnixSocketAddress { unsafe impl Send for UnixSocketAddress {} unsafe impl Sync for UnixSocketAddress {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixSocketAddressExt: IsA + sealed::Sealed + 'static { +pub trait UnixSocketAddressExt: IsA + 'static { #[doc(alias = "g_unix_socket_address_get_address_type")] #[doc(alias = "get_address_type")] #[doc(alias = "address-type")] diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/gio/src/auto/versions.txt +++ b/gio/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/gio/src/auto/vfs.rs b/gio/src/auto/vfs.rs index c3081f30b4ef..981cc31ffd4b 100644 --- a/gio/src/auto/vfs.rs +++ b/gio/src/auto/vfs.rs @@ -35,12 +35,7 @@ impl Vfs { unsafe impl Send for Vfs {} unsafe impl Sync for Vfs {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait VfsExt: IsA + sealed::Sealed + 'static { +pub trait VfsExt: IsA + 'static { #[doc(alias = "g_vfs_get_file_for_path")] #[doc(alias = "get_file_for_path")] fn file_for_path(&self, path: &str) -> File { diff --git a/gio/src/auto/volume.rs b/gio/src/auto/volume.rs index 3e3a66ceec48..fc5a0682a858 100644 --- a/gio/src/auto/volume.rs +++ b/gio/src/auto/volume.rs @@ -26,12 +26,7 @@ impl Volume { pub const NONE: Option<&'static Volume> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait VolumeExt: IsA + sealed::Sealed + 'static { +pub trait VolumeExt: IsA + 'static { #[doc(alias = "g_volume_can_eject")] fn can_eject(&self) -> bool { unsafe { from_glib(ffi::g_volume_can_eject(self.as_ref().to_glib_none().0)) } diff --git a/gio/src/auto/volume_monitor.rs b/gio/src/auto/volume_monitor.rs index 0b8c35b9cc97..d9c596f88869 100644 --- a/gio/src/auto/volume_monitor.rs +++ b/gio/src/auto/volume_monitor.rs @@ -28,12 +28,7 @@ impl VolumeMonitor { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait VolumeMonitorExt: IsA + sealed::Sealed + 'static { +pub trait VolumeMonitorExt: IsA + 'static { #[doc(alias = "g_volume_monitor_get_connected_drives")] #[doc(alias = "get_connected_drives")] fn connected_drives(&self) -> Vec { diff --git a/gio/src/cancellable.rs b/gio/src/cancellable.rs index 3a36a947fd20..3ed1ca9a5386 100644 --- a/gio/src/cancellable.rs +++ b/gio/src/cancellable.rs @@ -32,12 +32,7 @@ impl TryFromGlib for CancelledHandlerId { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait CancellableExtManual: sealed::Sealed + IsA { +pub trait CancellableExtManual: IsA { // 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 diff --git a/gio/src/converter.rs b/gio/src/converter.rs index fdb8cbd96238..3a7e23d5e2f2 100644 --- a/gio/src/converter.rs +++ b/gio/src/converter.rs @@ -6,12 +6,7 @@ use glib::{prelude::*, translate::*}; use crate::{ffi, Converter, ConverterFlags, ConverterResult}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ConverterExtManual: sealed::Sealed + IsA + 'static { +pub trait ConverterExtManual: IsA + 'static { #[doc(alias = "g_converter_convert")] fn convert, OUT: AsMut<[u8]>>( &self, diff --git a/gio/src/data_input_stream.rs b/gio/src/data_input_stream.rs index dfc63ce3763b..07bfc1ca5822 100644 --- a/gio/src/data_input_stream.rs +++ b/gio/src/data_input_stream.rs @@ -6,12 +6,7 @@ use glib::{prelude::*, translate::*, GString}; use crate::{ffi, Cancellable, DataInputStream}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DataInputStreamExtManual: sealed::Sealed + IsA + 'static { +pub trait DataInputStreamExtManual: IsA + 'static { #[doc(alias = "g_data_input_stream_read_line")] fn read_line>( &self, diff --git a/gio/src/datagram_based.rs b/gio/src/datagram_based.rs index 6521f5637f12..4d0c9b4e7ec2 100644 --- a/gio/src/datagram_based.rs +++ b/gio/src/datagram_based.rs @@ -7,12 +7,7 @@ use glib::{prelude::*, translate::*}; use crate::{ffi, Cancellable, DatagramBased, InputMessage, OutputMessage}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DatagramBasedExtManual: sealed::Sealed + IsA + Sized { +pub trait DatagramBasedExtManual: IsA + Sized { #[doc(alias = "g_datagram_based_create_source")] fn create_source( &self, diff --git a/gio/src/dbus_proxy.rs b/gio/src/dbus_proxy.rs index 79e18bfcf0de..7f243dba8e01 100644 --- a/gio/src/dbus_proxy.rs +++ b/gio/src/dbus_proxy.rs @@ -6,12 +6,7 @@ use glib::{prelude::*, signal::connect_raw, translate::*, SignalHandlerId}; use crate::{ffi, DBusProxy}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DBusProxyExtManual: sealed::Sealed + IsA + 'static { +pub trait DBusProxyExtManual: IsA + 'static { #[cfg(feature = "v2_72")] #[doc(alias = "g-signal")] fn connect_g_signal< diff --git a/gio/src/debug_controller_dbus.rs b/gio/src/debug_controller_dbus.rs index 49dc1433b8ae..b8987ace6474 100644 --- a/gio/src/debug_controller_dbus.rs +++ b/gio/src/debug_controller_dbus.rs @@ -4,12 +4,7 @@ use glib::prelude::*; use crate::{DBusConnection, DebugControllerDBus}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DebugControllerDBusExtManual: sealed::Sealed + IsA + Sized { +pub trait DebugControllerDBusExtManual: IsA + Sized { fn connection(&self) -> DBusConnection { ObjectExt::property(self.as_ref(), "connection") } diff --git a/gio/src/desktop_app_info.rs b/gio/src/desktop_app_info.rs index 5e826cd70442..f849c99b0dbc 100644 --- a/gio/src/desktop_app_info.rs +++ b/gio/src/desktop_app_info.rs @@ -45,13 +45,7 @@ impl DesktopAppInfo { } #[cfg(all(feature = "v2_58", unix))] -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -#[cfg(all(feature = "v2_58", unix))] -pub trait DesktopAppInfoExtManual: sealed::Sealed + IsA { +pub trait DesktopAppInfoExtManual: IsA { #[cfg_attr(docsrs, doc(cfg(all(feature = "v2_58", unix))))] #[doc(alias = "g_desktop_app_info_launch_uris_as_manager_with_fds")] fn launch_uris_as_manager_with_fds< diff --git a/gio/src/file.rs b/gio/src/file.rs index 61b1a120a258..9085c60f7e5b 100644 --- a/gio/src/file.rs +++ b/gio/src/file.rs @@ -163,12 +163,7 @@ impl File { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileExtManual: sealed::Sealed + IsA + Sized { +pub trait FileExtManual: IsA + Sized { #[doc(alias = "g_file_replace_contents_async")] fn replace_contents_async< B: AsRef<[u8]> + Send + 'static, diff --git a/gio/src/file_descriptor_based.rs b/gio/src/file_descriptor_based.rs index 357636c1895c..3a08c0b62a7b 100644 --- a/gio/src/file_descriptor_based.rs +++ b/gio/src/file_descriptor_based.rs @@ -27,14 +27,7 @@ impl AsRawFd for FileDescriptorBased { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileDescriptorBasedExtManual: - sealed::Sealed + IsA + 'static -{ +pub trait FileDescriptorBasedExtManual: IsA + 'static { #[doc(alias = "g_file_descriptor_based_get_fd")] #[doc(alias = "get_fd")] fn fd(&self) -> T { diff --git a/gio/src/file_enumerator.rs b/gio/src/file_enumerator.rs index 80faa75d5c52..8ef62f26a87a 100644 --- a/gio/src/file_enumerator.rs +++ b/gio/src/file_enumerator.rs @@ -18,12 +18,7 @@ impl Iterator for FileEnumerator { impl FusedIterator for FileEnumerator {} -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FileEnumeratorExtManual: sealed::Sealed + IsA { +pub trait FileEnumeratorExtManual: IsA { // rustdoc-stripper-ignore-next /// Converts the enumerator into a [`Stream`](futures_core::Stream). fn into_stream(self, num_files: i32, priority: glib::Priority) -> FileEnumeratorStream { diff --git a/gio/src/inet_address.rs b/gio/src/inet_address.rs index e5d413accf98..663ce63f47be 100644 --- a/gio/src/inet_address.rs +++ b/gio/src/inet_address.rs @@ -42,12 +42,7 @@ impl InetAddress { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait InetAddressExtManual: sealed::Sealed + IsA + 'static { +pub trait InetAddressExtManual: IsA + 'static { // rustdoc-stripper-ignore-next /// Returns `None` in case the address has a native size different than 4 and 16. #[doc(alias = "g_inet_address_to_bytes")] diff --git a/gio/src/input_stream.rs b/gio/src/input_stream.rs index 59ae974c11e4..fb874f96f2b9 100644 --- a/gio/src/input_stream.rs +++ b/gio/src/input_stream.rs @@ -8,12 +8,7 @@ use glib::{prelude::*, translate::*, Priority}; use crate::{error::to_std_io_result, ffi, prelude::*, Cancellable, InputStream, Seekable}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait InputStreamExtManual: sealed::Sealed + IsA + Sized { +pub trait InputStreamExtManual: IsA + Sized { #[doc(alias = "g_input_stream_read")] fn read, C: IsA>( &self, diff --git a/gio/src/io_stream.rs b/gio/src/io_stream.rs index 3335f7b4cca2..5cf2ac46b07f 100644 --- a/gio/src/io_stream.rs +++ b/gio/src/io_stream.rs @@ -11,12 +11,7 @@ use crate::{ PollableOutputStream, }; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait IOStreamExtManual: sealed::Sealed + Sized + IsA { +pub trait IOStreamExtManual: Sized + IsA { fn into_async_read_write(self) -> Result, Self> { let write = self .output_stream() diff --git a/gio/src/list_model.rs b/gio/src/list_model.rs index 5eaa3caa8cd2..1ed07966b36d 100644 --- a/gio/src/list_model.rs +++ b/gio/src/list_model.rs @@ -6,12 +6,7 @@ use glib::SignalHandlerId; use crate::{prelude::*, ListModel}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait ListModelExtManual: sealed::Sealed + IsA + Sized { +pub trait ListModelExtManual: IsA + Sized { // rustdoc-stripper-ignore-next /// Get an immutable snapshot of the container inside the `ListModel`. /// Any modification done to the returned container `Vec` will not be diff --git a/gio/src/output_stream.rs b/gio/src/output_stream.rs index ef53438d0201..3ad1969f8c1c 100644 --- a/gio/src/output_stream.rs +++ b/gio/src/output_stream.rs @@ -8,12 +8,7 @@ use glib::{prelude::*, translate::*, Priority}; use crate::OutputVector; use crate::{error::to_std_io_result, ffi, prelude::*, Cancellable, OutputStream, Seekable}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait OutputStreamExtManual: sealed::Sealed + IsA + Sized { +pub trait OutputStreamExtManual: IsA + Sized { #[doc(alias = "g_output_stream_write_async")] fn write_async< B: AsRef<[u8]> + Send + 'static, diff --git a/gio/src/pollable_input_stream.rs b/gio/src/pollable_input_stream.rs index 72ce1e6ea5a5..e6a100d7e3aa 100644 --- a/gio/src/pollable_input_stream.rs +++ b/gio/src/pollable_input_stream.rs @@ -11,12 +11,7 @@ use glib::{prelude::*, translate::*}; use crate::{ffi, prelude::*, Cancellable, PollableInputStream}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PollableInputStreamExtManual: sealed::Sealed + IsA + Sized { +pub trait PollableInputStreamExtManual: IsA + Sized { #[doc(alias = "g_pollable_input_stream_create_source")] fn create_source( &self, diff --git a/gio/src/pollable_output_stream.rs b/gio/src/pollable_output_stream.rs index 3a84fbff9ca3..7a861b289861 100644 --- a/gio/src/pollable_output_stream.rs +++ b/gio/src/pollable_output_stream.rs @@ -15,12 +15,7 @@ use crate::{error::to_std_io_result, ffi, prelude::*, Cancellable, PollableOutpu #[cfg(feature = "v2_60")] use crate::{OutputVector, PollableReturn}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PollableOutputStreamExtManual: sealed::Sealed + IsA { +pub trait PollableOutputStreamExtManual: IsA { #[doc(alias = "g_pollable_output_stream_create_source")] fn create_source( &self, diff --git a/gio/src/settings.rs b/gio/src/settings.rs index d0eda98f65d6..57bc9cec95a4 100644 --- a/gio/src/settings.rs +++ b/gio/src/settings.rs @@ -167,12 +167,7 @@ impl<'a> BindingBuilder<'a> { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SettingsExtManual: sealed::Sealed + IsA { +pub trait SettingsExtManual: IsA { fn get(&self, key: &str) -> U { let val = self.value(key); FromVariant::from_variant(&val).unwrap_or_else(|| { diff --git a/gio/src/simple_proxy_resolver.rs b/gio/src/simple_proxy_resolver.rs index 3332572b096d..bd99cede28c0 100644 --- a/gio/src/simple_proxy_resolver.rs +++ b/gio/src/simple_proxy_resolver.rs @@ -19,14 +19,7 @@ impl SimpleProxyResolver { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SimpleProxyResolverExtManual: - sealed::Sealed + IsA + 'static -{ +pub trait SimpleProxyResolverExtManual: IsA + 'static { #[doc(alias = "g_simple_proxy_resolver_set_ignore_hosts")] fn set_ignore_hosts(&self, ignore_hosts: impl IntoStrV) { unsafe { diff --git a/gio/src/socket.rs b/gio/src/socket.rs index 9662b80ad74c..5178f859a69a 100644 --- a/gio/src/socket.rs +++ b/gio/src/socket.rs @@ -289,12 +289,7 @@ impl<'m> OutputMessage<'m> { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketExtManual: sealed::Sealed + IsA + Sized { +pub trait SocketExtManual: IsA + Sized { #[doc(alias = "g_socket_receive")] fn receive, C: IsA>( &self, diff --git a/gio/src/socket_control_message.rs b/gio/src/socket_control_message.rs index 143ae8decc29..433e35272b61 100644 --- a/gio/src/socket_control_message.rs +++ b/gio/src/socket_control_message.rs @@ -4,14 +4,7 @@ use glib::{prelude::*, translate::*}; use crate::{prelude::*, SocketControlMessage}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait SocketControlMessageExtManual: - sealed::Sealed + IsA + Sized -{ +pub trait SocketControlMessageExtManual: IsA + Sized { #[doc(alias = "g_socket_control_message_serialize")] fn serialize(&self, data: &mut [u8]) { assert!(data.len() >= self.size()); diff --git a/gio/src/tls_connection.rs b/gio/src/tls_connection.rs index 54614ce7dcdc..7e28c4ddfdab 100644 --- a/gio/src/tls_connection.rs +++ b/gio/src/tls_connection.rs @@ -11,12 +11,7 @@ use glib::translate::*; use crate::TlsChannelBindingType; use crate::TlsConnection; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TlsConnectionExtManual: sealed::Sealed + IsA { +pub trait TlsConnectionExtManual: IsA { #[cfg(feature = "v2_66")] #[cfg_attr(docsrs, doc(cfg(feature = "v2_66")))] #[doc(alias = "g_tls_connection_get_channel_binding_data")] diff --git a/gio/src/unix_fd_list.rs b/gio/src/unix_fd_list.rs index f6c77515e240..24e7048f044e 100644 --- a/gio/src/unix_fd_list.rs +++ b/gio/src/unix_fd_list.rs @@ -23,12 +23,7 @@ impl UnixFDList { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixFDListExtManual: sealed::Sealed + IsA + Sized { +pub trait UnixFDListExtManual: IsA + Sized { #[doc(alias = "g_unix_fd_list_append")] fn append(&self, fd: T) -> Result { unsafe { diff --git a/gio/src/unix_fd_message.rs b/gio/src/unix_fd_message.rs index b573997b452d..48af5a7ce97f 100644 --- a/gio/src/unix_fd_message.rs +++ b/gio/src/unix_fd_message.rs @@ -10,12 +10,7 @@ use socket::{AsRawFd, RawFd}; use crate::{ffi, UnixFDMessage}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixFDMessageExtManual: sealed::Sealed + IsA + Sized { +pub trait UnixFDMessageExtManual: IsA + Sized { #[doc(alias = "g_unix_fd_message_append_fd")] fn append_fd(&self, fd: T) -> Result<(), glib::Error> { unsafe { diff --git a/gio/src/unix_input_stream.rs b/gio/src/unix_input_stream.rs index ce515a332fe8..479951cee6eb 100644 --- a/gio/src/unix_input_stream.rs +++ b/gio/src/unix_input_stream.rs @@ -43,12 +43,7 @@ impl AsRawFd for UnixInputStream { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixInputStreamExtManual: sealed::Sealed + IsA + Sized { +pub trait UnixInputStreamExtManual: IsA + Sized { // rustdoc-stripper-ignore-next /// Sets whether the fd of this stream will be closed when the stream is closed. /// diff --git a/gio/src/unix_output_stream.rs b/gio/src/unix_output_stream.rs index 255fe8a207f9..3fbfdab713f4 100644 --- a/gio/src/unix_output_stream.rs +++ b/gio/src/unix_output_stream.rs @@ -43,12 +43,7 @@ impl AsRawFd for UnixOutputStream { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixOutputStreamExtManual: sealed::Sealed + IsA + Sized { +pub trait UnixOutputStreamExtManual: IsA + Sized { // rustdoc-stripper-ignore-next /// Sets whether the fd of this stream will be closed when the stream is closed. /// diff --git a/gio/src/unix_socket_address.rs b/gio/src/unix_socket_address.rs index 6b17fcadec96..59cc1ba41ffe 100644 --- a/gio/src/unix_socket_address.rs +++ b/gio/src/unix_socket_address.rs @@ -65,12 +65,7 @@ impl UnixSocketAddress { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait UnixSocketAddressExtManual: sealed::Sealed + IsA + 'static { +pub trait UnixSocketAddressExtManual: IsA + 'static { #[doc(alias = "g_unix_socket_address_get_path")] #[doc(alias = "get_path")] fn path(&self) -> Option { diff --git a/gio/src/win32_input_stream.rs b/gio/src/win32_input_stream.rs index 5ac42731efb3..e2f0fe044aed 100644 --- a/gio/src/win32_input_stream.rs +++ b/gio/src/win32_input_stream.rs @@ -52,12 +52,7 @@ impl AsRawHandle for Win32InputStream { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait Win32InputStreamExt: sealed::Sealed + IsA + Sized { +pub trait Win32InputStreamExt: IsA + Sized { #[doc(alias = "g_win32_input_stream_get_close_handle")] #[doc(alias = "get_close_handle")] fn closes_handle(&self) -> bool { diff --git a/gio/src/win32_output_stream.rs b/gio/src/win32_output_stream.rs index 3b1ad736fef5..b68a027d33a2 100644 --- a/gio/src/win32_output_stream.rs +++ b/gio/src/win32_output_stream.rs @@ -52,12 +52,7 @@ impl AsRawHandle for Win32OutputStream { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait Win32OutputStreamExt: sealed::Sealed + IsA + Sized { +pub trait Win32OutputStreamExt: IsA + Sized { #[doc(alias = "g_win32_output_stream_get_close_handle")] #[doc(alias = "get_close_handle")] fn closes_handle(&self) -> bool { diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/gio/sys/versions.txt +++ b/gio/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/gir b/gir index a11b11f2e403..eff839d4745d 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit a11b11f2e403d615edd94497b6fe5b3c5283145b +Subproject commit eff839d4745d5eb210834507c2a9598741ad2e54 diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/glib/gobject-sys/versions.txt +++ b/glib/gobject-sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/glib/src/auto/versions.txt +++ b/glib/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/glib/src/gobject/dynamic_object.rs b/glib/src/gobject/dynamic_object.rs index 2639f5ef27a2..1bdb0578ee4b 100644 --- a/glib/src/gobject/dynamic_object.rs +++ b/glib/src/gobject/dynamic_object.rs @@ -7,12 +7,7 @@ use crate::{ InterfaceInfo, Object, TypeFlags, TypeInfo, TypeModule, TypePlugin, }; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait DynamicObjectRegisterExt: AsRef + sealed::Sealed + 'static { +pub trait DynamicObjectRegisterExt: AsRef + 'static { fn add_dynamic_interface( &self, instance_type: crate::types::Type, diff --git a/glib/src/gobject/type_module.rs b/glib/src/gobject/type_module.rs index 22715f9157d2..23dfed0cb8fd 100644 --- a/glib/src/gobject/type_module.rs +++ b/glib/src/gobject/type_module.rs @@ -21,12 +21,7 @@ impl TypeModule { pub const NONE: Option<&'static TypeModule> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TypeModuleExt: IsA + sealed::Sealed + 'static { +pub trait TypeModuleExt: IsA + 'static { #[doc(alias = "g_type_module_add_interface")] fn add_interface( &self, diff --git a/glib/src/gobject/type_plugin.rs b/glib/src/gobject/type_plugin.rs index 8a941e3a20fd..82b42eaab091 100644 --- a/glib/src/gobject/type_plugin.rs +++ b/glib/src/gobject/type_plugin.rs @@ -15,12 +15,7 @@ impl TypePlugin { pub const NONE: Option<&'static TypePlugin> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait TypePluginExt: IsA + sealed::Sealed + 'static { +pub trait TypePluginExt: IsA + 'static { #[doc(alias = "g_type_plugin_complete_interface_info")] fn complete_interface_info( &self, diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/glib/sys/versions.txt +++ b/glib/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/graphene/src/auto/versions.txt +++ b/graphene/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/graphene/sys/versions.txt +++ b/graphene/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/pango/src/auto/font.rs b/pango/src/auto/font.rs index 8655b42d298a..ba5c8f2a9539 100644 --- a/pango/src/auto/font.rs +++ b/pango/src/auto/font.rs @@ -46,12 +46,7 @@ impl Font { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FontExt: IsA + sealed::Sealed + 'static { +pub trait FontExt: IsA + 'static { #[doc(alias = "pango_font_describe")] fn describe(&self) -> FontDescription { unsafe { from_glib_full(ffi::pango_font_describe(self.as_ref().to_glib_none().0)) } diff --git a/pango/src/auto/font_face.rs b/pango/src/auto/font_face.rs index 2a0012bab28f..1b288801201b 100644 --- a/pango/src/auto/font_face.rs +++ b/pango/src/auto/font_face.rs @@ -21,12 +21,7 @@ impl FontFace { pub const NONE: Option<&'static FontFace> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FontFaceExt: IsA + sealed::Sealed + 'static { +pub trait FontFaceExt: IsA + 'static { #[doc(alias = "pango_font_face_describe")] fn describe(&self) -> FontDescription { unsafe { diff --git a/pango/src/auto/font_family.rs b/pango/src/auto/font_family.rs index 0e1ff116d74b..17fc44b8f9f0 100644 --- a/pango/src/auto/font_family.rs +++ b/pango/src/auto/font_family.rs @@ -31,12 +31,7 @@ impl std::fmt::Display for FontFamily { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FontFamilyExt: IsA + sealed::Sealed + 'static { +pub trait FontFamilyExt: IsA + 'static { #[cfg(feature = "v1_46")] #[cfg_attr(docsrs, doc(cfg(feature = "v1_46")))] #[doc(alias = "pango_font_family_get_face")] diff --git a/pango/src/auto/font_map.rs b/pango/src/auto/font_map.rs index c2c01d44c785..bdd1128dd7f2 100644 --- a/pango/src/auto/font_map.rs +++ b/pango/src/auto/font_map.rs @@ -18,12 +18,7 @@ impl FontMap { pub const NONE: Option<&'static FontMap> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FontMapExt: IsA + sealed::Sealed + 'static { +pub trait FontMapExt: IsA + 'static { #[doc(alias = "pango_font_map_changed")] fn changed(&self) { unsafe { diff --git a/pango/src/auto/fontset.rs b/pango/src/auto/fontset.rs index 1864fdd0bf67..39ba51dbdb88 100644 --- a/pango/src/auto/fontset.rs +++ b/pango/src/auto/fontset.rs @@ -18,12 +18,7 @@ impl Fontset { pub const NONE: Option<&'static Fontset> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait FontsetExt: IsA + sealed::Sealed + 'static { +pub trait FontsetExt: IsA + 'static { #[doc(alias = "pango_fontset_foreach")] fn foreach bool>(&self, func: P) { let func_data: P = func; diff --git a/pango/src/auto/renderer.rs b/pango/src/auto/renderer.rs index 886986ba2bc7..01ab525c6f04 100644 --- a/pango/src/auto/renderer.rs +++ b/pango/src/auto/renderer.rs @@ -20,12 +20,7 @@ impl Renderer { pub const NONE: Option<&'static Renderer> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait RendererExt: IsA + sealed::Sealed + 'static { +pub trait RendererExt: IsA + 'static { #[doc(alias = "pango_renderer_activate")] fn activate(&self) { unsafe { diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/pango/src/auto/versions.txt +++ b/pango/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/pango/sys/versions.txt +++ b/pango/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/pangocairo/src/auto/font.rs b/pangocairo/src/auto/font.rs index b31dcb93de4c..4480d3af6356 100644 --- a/pangocairo/src/auto/font.rs +++ b/pangocairo/src/auto/font.rs @@ -18,12 +18,7 @@ impl Font { pub const NONE: Option<&'static Font> = None; } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PangoCairoFontExt: IsA + sealed::Sealed + 'static { +pub trait PangoCairoFontExt: IsA + 'static { #[doc(alias = "pango_cairo_font_get_scaled_font")] #[doc(alias = "get_scaled_font")] fn scaled_font(&self) -> Option { diff --git a/pangocairo/src/auto/font_map.rs b/pangocairo/src/auto/font_map.rs index 1352a93bc524..02e191ba6c71 100644 --- a/pangocairo/src/auto/font_map.rs +++ b/pangocairo/src/auto/font_map.rs @@ -25,12 +25,7 @@ impl FontMap { } } -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PangoCairoFontMapExt: IsA + sealed::Sealed + 'static { +pub trait PangoCairoFontMapExt: IsA + 'static { #[doc(alias = "pango_cairo_font_map_get_resolution")] #[doc(alias = "get_resolution")] fn resolution(&self) -> f64 { diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/pangocairo/src/auto/versions.txt +++ b/pangocairo/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70) diff --git a/pangocairo/src/font_map.rs b/pangocairo/src/font_map.rs index ce3c06c63635..3338fd49b841 100644 --- a/pangocairo/src/font_map.rs +++ b/pangocairo/src/font_map.rs @@ -4,12 +4,7 @@ use glib::{prelude::*, translate::*}; use crate::{ffi, FontMap}; -mod sealed { - pub trait Sealed {} - impl> Sealed for T {} -} - -pub trait PangoCairoFontMapExtManual: sealed::Sealed + IsA + 'static { +pub trait PangoCairoFontMapExtManual: IsA + 'static { #[doc(alias = "pango_cairo_font_map_get_font_type")] #[doc(alias = "get_font_type")] fn font_type(&self) -> cairo::FontType { diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt index 4dfc7ef11610..445f598fc16a 100644 --- a/pangocairo/sys/versions.txt +++ b/pangocairo/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ a11b11f2e403) +Generated by gir (https://github.com/gtk-rs/gir @ eff839d4745d) from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)