Don't seal manual traits that correspond to auto-generated types

bilelmoussaoui · bilelmoussaoui · commit 2faf89aa1748 · 2024-10-18T19:09:32.000+02:00
As those have already the IsA&lt;T&gt; restriction which is an unsafe trait,
implemented by the glib::wrapper! macro.

The Unichar trait is still sealed though
diff --git 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<T: super::IsA<super::PixbufAnimation>> Sealed for T {}
-}
-
-pub trait PixbufAnimationExtManual: sealed::Sealed + IsA<PixbufAnimation> + 'static {
+pub trait PixbufAnimationExtManual: IsA<PixbufAnimation> + 'static {
     #[doc(alias = "gdk_pixbuf_animation_get_iter")]
     #[doc(alias = "get_iter")]
     fn iter(&self, start_time: Option<SystemTime>) -> PixbufAnimationIter {
diff --git 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<T: super::IsA<super::ActionMap>> Sealed for T {}
-}
-
-pub trait ActionMapExtManual: sealed::Sealed + IsA<ActionMap> {
+pub trait ActionMapExtManual: IsA<ActionMap> {
     #[doc(alias = "g_action_map_add_action_entries")]
     fn add_action_entries(&self, entries: impl IntoIterator<Item = ActionEntry<Self>>) {
         for entry in entries.into_iter() {
diff --git 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<T: super::IsA<super::AppInfo>> Sealed for T {}
-}
-
-pub trait AppInfoExtManual: sealed::Sealed + IsA<AppInfo> + 'static {
+pub trait AppInfoExtManual: IsA<AppInfo> + '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
@@ -11,12 +11,7 @@ use glib::{
 
 use crate::{ffi, Application, File};
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::Application>> Sealed for T {}
-}
-
-pub trait ApplicationExtManual: sealed::Sealed + IsA<Application> {
+pub trait ApplicationExtManual: IsA<Application> {
     #[doc(alias = "g_application_run")]
     fn run(&self) -> ExitCode {
         self.run_with_args(&std::env::args().collect::<Vec<_>>())
diff --git a/gio/src/cancellable.rs b/gio/src/cancellable.rs
@@ -32,12 +32,7 @@ impl TryFromGlib<libc::c_ulong> for CancelledHandlerId {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::Cancellable>> Sealed for T {}
-}
-
-pub trait CancellableExtManual: sealed::Sealed + IsA<Cancellable> {
+pub trait CancellableExtManual: IsA<Cancellable> {
     // rustdoc-stripper-ignore-next
     /// Convenience function to connect to the `signal::Cancellable::cancelled` signal. Also
     /// handles the race condition that may happen if the cancellable is cancelled right before
diff --git 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<T: super::IsA<super::Converter>> Sealed for T {}
-}
-
-pub trait ConverterExtManual: sealed::Sealed + IsA<Converter> + 'static {
+pub trait ConverterExtManual: IsA<Converter> + 'static {
     #[doc(alias = "g_converter_convert")]
     fn convert<IN: AsRef<[u8]>, OUT: AsMut<[u8]>>(
         &self,
diff --git 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<T: super::IsA<super::DataInputStream>> Sealed for T {}
-}
-
-pub trait DataInputStreamExtManual: sealed::Sealed + IsA<DataInputStream> + 'static {
+pub trait DataInputStreamExtManual: IsA<DataInputStream> + 'static {
     #[doc(alias = "g_data_input_stream_read_line")]
     fn read_line<P: IsA<Cancellable>>(
         &self,
diff --git 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<T: super::IsA<super::DatagramBased>> Sealed for T {}
-}
-
-pub trait DatagramBasedExtManual: sealed::Sealed + IsA<DatagramBased> + Sized {
+pub trait DatagramBasedExtManual: IsA<DatagramBased> + Sized {
     #[doc(alias = "g_datagram_based_create_source")]
     fn create_source<F, C>(
         &self,
diff --git 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<T: super::IsA<super::DBusProxy>> Sealed for T {}
-}
-
-pub trait DBusProxyExtManual: sealed::Sealed + IsA<DBusProxy> + 'static {
+pub trait DBusProxyExtManual: IsA<DBusProxy> + '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
@@ -4,12 +4,7 @@ use glib::prelude::*;
 
 use crate::{DBusConnection, DebugControllerDBus};
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::DebugControllerDBus>> Sealed for T {}
-}
-
-pub trait DebugControllerDBusExtManual: sealed::Sealed + IsA<DebugControllerDBus> + Sized {
+pub trait DebugControllerDBusExtManual: IsA<DebugControllerDBus> + 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
@@ -45,13 +45,7 @@ impl DesktopAppInfo {
 }
 
 #[cfg(all(feature = "v2_58", unix))]
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::DesktopAppInfo>> Sealed for T {}
-}
-
-#[cfg(all(feature = "v2_58", unix))]
-pub trait DesktopAppInfoExtManual: sealed::Sealed + IsA<DesktopAppInfo> {
+pub trait DesktopAppInfoExtManual: IsA<DesktopAppInfo> {
     #[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
@@ -163,12 +163,7 @@ impl File {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::File>> Sealed for T {}
-}
-
-pub trait FileExtManual: sealed::Sealed + IsA<File> + Sized {
+pub trait FileExtManual: IsA<File> + 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
@@ -27,14 +27,7 @@ impl AsRawFd for FileDescriptorBased {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::FileDescriptorBased>> Sealed for T {}
-}
-
-pub trait FileDescriptorBasedExtManual:
-    sealed::Sealed + IsA<FileDescriptorBased> + 'static
-{
+pub trait FileDescriptorBasedExtManual: IsA<FileDescriptorBased> + 'static {
     #[doc(alias = "g_file_descriptor_based_get_fd")]
     #[doc(alias = "get_fd")]
     fn fd<T: FromRawFd>(&self) -> T {
diff --git 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<T: super::IsA<super::FileEnumerator>> Sealed for T {}
-}
-
-pub trait FileEnumeratorExtManual: sealed::Sealed + IsA<FileEnumerator> {
+pub trait FileEnumeratorExtManual: IsA<FileEnumerator> {
     // 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
@@ -42,12 +42,7 @@ impl InetAddress {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::InetAddress>> Sealed for T {}
-}
-
-pub trait InetAddressExtManual: sealed::Sealed + IsA<InetAddress> + 'static {
+pub trait InetAddressExtManual: IsA<InetAddress> + '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
@@ -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<T: super::IsA<super::InputStream>> Sealed for T {}
-}
-
-pub trait InputStreamExtManual: sealed::Sealed + IsA<InputStream> + Sized {
+pub trait InputStreamExtManual: IsA<InputStream> + Sized {
     #[doc(alias = "g_input_stream_read")]
     fn read<B: AsMut<[u8]>, C: IsA<Cancellable>>(
         &self,
diff --git 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<T: super::IsA<super::IOStream>> Sealed for T {}
-}
-
-pub trait IOStreamExtManual: sealed::Sealed + Sized + IsA<IOStream> {
+pub trait IOStreamExtManual: Sized + IsA<IOStream> {
     fn into_async_read_write(self) -> Result<IOStreamAsyncReadWrite<Self>, Self> {
         let write = self
             .output_stream()
diff --git 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<T: super::IsA<super::ListModel>> Sealed for T {}
-}
-
-pub trait ListModelExtManual: sealed::Sealed + IsA<ListModel> + Sized {
+pub trait ListModelExtManual: IsA<ListModel> + 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
@@ -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<T: super::IsA<super::OutputStream>> Sealed for T {}
-}
-
-pub trait OutputStreamExtManual: sealed::Sealed + IsA<OutputStream> + Sized {
+pub trait OutputStreamExtManual: IsA<OutputStream> + 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
@@ -11,12 +11,7 @@ use glib::{prelude::*, translate::*};
 
 use crate::{ffi, prelude::*, Cancellable, PollableInputStream};
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::PollableInputStream>> Sealed for T {}
-}
-
-pub trait PollableInputStreamExtManual: sealed::Sealed + IsA<PollableInputStream> + Sized {
+pub trait PollableInputStreamExtManual: IsA<PollableInputStream> + Sized {
     #[doc(alias = "g_pollable_input_stream_create_source")]
     fn create_source<F, C>(
         &self,
diff --git 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<T: super::IsA<super::PollableOutputStream>> Sealed for T {}
-}
-
-pub trait PollableOutputStreamExtManual: sealed::Sealed + IsA<PollableOutputStream> {
+pub trait PollableOutputStreamExtManual: IsA<PollableOutputStream> {
     #[doc(alias = "g_pollable_output_stream_create_source")]
     fn create_source<F, C>(
         &self,
diff --git a/gio/src/settings.rs b/gio/src/settings.rs
@@ -167,12 +167,7 @@ impl<'a> BindingBuilder<'a> {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::Settings>> Sealed for T {}
-}
-
-pub trait SettingsExtManual: sealed::Sealed + IsA<Settings> {
+pub trait SettingsExtManual: IsA<Settings> {
     fn get<U: FromVariant>(&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
@@ -19,14 +19,7 @@ impl SimpleProxyResolver {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::SimpleProxyResolver>> Sealed for T {}
-}
-
-pub trait SimpleProxyResolverExtManual:
-    sealed::Sealed + IsA<SimpleProxyResolver> + 'static
-{
+pub trait SimpleProxyResolverExtManual: IsA<SimpleProxyResolver> + '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
@@ -289,12 +289,7 @@ impl<'m> OutputMessage<'m> {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::Socket>> Sealed for T {}
-}
-
-pub trait SocketExtManual: sealed::Sealed + IsA<Socket> + Sized {
+pub trait SocketExtManual: IsA<Socket> + Sized {
     #[doc(alias = "g_socket_receive")]
     fn receive<B: AsMut<[u8]>, C: IsA<Cancellable>>(
         &self,
diff --git 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<T: super::IsA<super::SocketControlMessage>> Sealed for T {}
-}
-
-pub trait SocketControlMessageExtManual:
-    sealed::Sealed + IsA<SocketControlMessage> + Sized
-{
+pub trait SocketControlMessageExtManual: IsA<SocketControlMessage> + 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
@@ -11,12 +11,7 @@ use glib::translate::*;
 use crate::TlsChannelBindingType;
 use crate::TlsConnection;
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::TlsConnection>> Sealed for T {}
-}
-
-pub trait TlsConnectionExtManual: sealed::Sealed + IsA<TlsConnection> {
+pub trait TlsConnectionExtManual: IsA<TlsConnection> {
     #[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
@@ -23,12 +23,7 @@ impl UnixFDList {
     }
 }
 
-mod sealed {
-    pub trait Sealed {}
-    impl<T: super::IsA<super::UnixFDList>> Sealed for T {}
-}
-
-pub trait UnixFDListExtManual: sealed::Sealed + IsA<UnixFDList> + Sized {
+pub trait UnixFDListExtManual: IsA<UnixFDList> + Sized {
     #[doc(alias = "g_unix_fd_list_append")]
     fn append<T: AsRawFd>(&self, fd: T) -> Result<i32, glib::Error> {
         unsafe {
diff --git 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<T: super::IsA<super::UnixFDMessage>> Sealed for T {}
-}
-
-pub trait UnixFDMessageExtManual: sealed::Sealed + IsA<UnixFDMessage> + Sized {
+pub trait UnixFDMessageExtManual: IsA<UnixFDMessage> + Sized {
     #[doc(alias = "g_unix_fd_message_append_fd")]
     fn append_fd<T: AsRawFd>(&self, fd: T) -> Result<(), glib::Error> {
         unsafe {
diff --git a/gio/src/unix_input_stream.rs b/gio/src/unix_input_stream.rs
diff --git a/gio/src/unix_output_stream.rs b/gio/src/unix_output_stream.rs
diff --git a/gio/src/unix_socket_address.rs b/gio/src/unix_socket_address.rs
diff --git a/gio/src/win32_input_stream.rs b/gio/src/win32_input_stream.rs
diff --git a/gio/src/win32_output_stream.rs b/gio/src/win32_output_stream.rs
diff --git a/glib/src/gobject/dynamic_object.rs b/glib/src/gobject/dynamic_object.rs
diff --git a/glib/src/gobject/type_module.rs b/glib/src/gobject/type_module.rs
diff --git a/glib/src/gobject/type_plugin.rs b/glib/src/gobject/type_plugin.rs
diff --git a/pangocairo/src/font_map.rs b/pangocairo/src/font_map.rs

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,7 @@ impl TryFromGlib<libc::c_ulong> for CancelledHandlerId {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-mod sealed {`
`36`		`- pub trait Sealed {}`
`37`		`- impl<T: super::IsA<super::Cancellable>> Sealed for T {}`
`38`		`-}`
`39`		`-`
`40`		`-pub trait CancellableExtManual: sealed::Sealed + IsA<Cancellable> {`
	`35`	`+pub trait CancellableExtManual: IsA<Cancellable> {`
`41`	`36`	`// rustdoc-stripper-ignore-next`
`42`	`37`	/// Convenience function to connect to the `signal::Cancellable::cancelled` signal. Also
`43`	`38`	`/// handles the race condition that may happen if the cancellable is cancelled right before`