glib/gio: Replace various type parameters with impl trait

Author: sdroege

gio/src/socket.rs

@@ -24,7 +24,7 @@ use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket}
 
 impl Socket {
     #[cfg(any(unix, feature = "dox"))]
-    pub unsafe fn from_fd<T: IntoRawFd>(fd: T) -> Result<Socket, glib::Error> {
+    pub unsafe fn from_fd(fd: impl IntoRawFd) -> Result<Socket, glib::Error> {
         let fd = fd.into_raw_fd();
         let mut error = ptr::null_mut();
         let ret = ffi::g_socket_new_from_fd(fd, &mut error);
@@ -35,7 +35,7 @@ impl Socket {
         }
     }
     #[cfg(any(windows, feature = "dox"))]
-    pub unsafe fn from_socket<T: IntoRawSocket>(socket: T) -> Result<Socket, glib::Error> {
+    pub unsafe fn from_socket(socket: impl IntoRawSocket) -> Result<Socket, glib::Error> {
         let socket = socket.into_raw_socket();
         let mut error = ptr::null_mut();
         let ret = ffi::g_socket_new_from_fd(socket as i32, &mut error);

gio/src/subprocess_launcher.rs

@@ -18,7 +18,7 @@ impl SubprocessLauncher {
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
     #[doc(alias = "g_subprocess_launcher_take_fd")]
-    pub fn take_fd<F: IntoRawFd, G: IntoRawFd>(&self, source_fd: F, target_fd: G) {
+    pub fn take_fd(&self, source_fd: impl IntoRawFd, target_fd: impl IntoRawFd) {
         unsafe {
             ffi::g_subprocess_launcher_take_fd(
                 self.to_glib_none().0,
@@ -31,7 +31,7 @@ impl SubprocessLauncher {
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
     #[doc(alias = "g_subprocess_launcher_take_stderr_fd")]
-    pub fn take_stderr_fd<F: IntoRawFd>(&self, fd: F) {
+    pub fn take_stderr_fd(&self, fd: impl IntoRawFd) {
         unsafe {
             ffi::g_subprocess_launcher_take_stderr_fd(self.to_glib_none().0, fd.into_raw_fd());
         }
@@ -40,7 +40,7 @@ impl SubprocessLauncher {
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
     #[doc(alias = "g_subprocess_launcher_take_stdin_fd")]
-    pub fn take_stdin_fd<F: IntoRawFd>(&self, fd: F) {
+    pub fn take_stdin_fd(&self, fd: impl IntoRawFd) {
         unsafe {
             ffi::g_subprocess_launcher_take_stdin_fd(self.to_glib_none().0, fd.into_raw_fd());
         }
@@ -49,7 +49,7 @@ impl SubprocessLauncher {
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
     #[doc(alias = "g_subprocess_launcher_take_stdout_fd")]
-    pub fn take_stdout_fd<F: IntoRawFd>(&self, fd: F) {
+    pub fn take_stdout_fd(&self, fd: impl IntoRawFd) {
         unsafe {
             ffi::g_subprocess_launcher_take_stdout_fd(self.to_glib_none().0, fd.into_raw_fd());
         }

gio/src/unix_fd_list.rs

@@ -13,11 +13,7 @@ use socket::{AsRawFd, IntoRawFd, RawFd};
 
 impl UnixFDList {
     #[doc(alias = "g_unix_fd_list_new_from_array")]
-    pub fn from_array<T>(fds: T) -> UnixFDList
-    where
-        T: IntoIterator,
-        T::Item: IntoRawFd,
-    {
+    pub fn from_array(fds: impl IntoIterator<Item = impl IntoRawFd>) -> UnixFDList {
         let fds = fds.into_iter().map(|t| t.into_raw_fd()).collect::<Vec<_>>();
         unsafe {
             from_glib_full(ffi::g_unix_fd_list_new_from_array(

gio/src/unix_input_stream.rs

@@ -20,7 +20,7 @@ impl UnixInputStream {
     /// with `true` on this stream. At which point you may only do so when all references to this
     /// stream have been dropped.
     #[doc(alias = "g_unix_input_stream_new")]
-    pub unsafe fn take_fd<T: IntoRawFd>(fd: T) -> UnixInputStream {
+    pub unsafe fn take_fd(fd: impl IntoRawFd) -> UnixInputStream {
         let fd = fd.into_raw_fd();
         let close_fd = true.into_glib();
         InputStream::from_glib_full(ffi::g_unix_input_stream_new(fd, close_fd)).unsafe_cast()

gio/src/unix_output_stream.rs

@@ -20,7 +20,7 @@ impl UnixOutputStream {
     /// on this stream. At which point you may only do so when all references to this stream have
     /// been dropped.
     #[doc(alias = "g_unix_output_stream_new")]
-    pub unsafe fn take_fd<T: IntoRawFd>(fd: T) -> UnixOutputStream {
+    pub unsafe fn take_fd(fd: impl IntoRawFd) -> UnixOutputStream {
         let fd = fd.into_raw_fd();
         let close_fd = true.into_glib();
         OutputStream::from_glib_full(ffi::g_unix_output_stream_new(fd, close_fd)).unsafe_cast()

gio/src/win32_input_stream.rs

@@ -48,7 +48,7 @@ impl Win32InputStream {
     /// with `true` on this stream. At which point you may only do so when all references to this
     /// stream have been dropped.
     #[doc(alias = "g_win32_input_stream_new")]
-    pub unsafe fn take_handle<T: IntoRawHandle>(handle: T) -> Win32InputStream {
+    pub unsafe fn take_handle(handle: impl IntoRawHandle) -> Win32InputStream {
         let handle = handle.into_raw_handle();
         let close_handle = true.into_glib();
         InputStream::from_glib_full(ffi::g_win32_input_stream_new(handle, close_handle))

gio/src/win32_output_stream.rs

@@ -48,7 +48,7 @@ impl Win32OutputStream {
     /// with `true` on this stream. At which point you may only do so when all references to this
     /// stream have been dropped.
     #[doc(alias = "g_win32_output_stream_new")]
-    pub unsafe fn take_handle<T: IntoRawHandle>(handle: T) -> Win32OutputStream {
+    pub unsafe fn take_handle(handle: impl IntoRawHandle) -> Win32OutputStream {
         let handle = handle.into_raw_handle();
         let close_handle = true.into_glib();
         OutputStream::from_glib_full(ffi::g_win32_output_stream_new(handle, close_handle))

glib/src/error.rs

@@ -199,8 +199,8 @@ pub struct BoolError {
 }
 
 impl BoolError {
-    pub fn new<Msg: Into<Cow<'static, str>>>(
-        message: Msg,
+    pub fn new(
+        message: impl Into<Cow<'static, str>>,
         filename: &'static str,
         function: &'static str,
         line: u32,
@@ -213,9 +213,9 @@ impl BoolError {
         }
     }
 
-    pub fn from_glib<Msg: Into<Cow<'static, str>>>(
+    pub fn from_glib(
         b: ffi::gboolean,
-        message: Msg,
+        message: impl Into<Cow<'static, str>>,
         filename: &'static str,
         function: &'static str,
         line: u32,

glib/src/variant.rs

@@ -421,8 +421,8 @@ impl Variant {
     ///
     /// This function panics if not all variants are of type `T`.
     #[doc(alias = "g_variant_new_array")]
-    pub fn array_from_iter<T: StaticVariantType, I: IntoIterator<Item = Variant>>(
-        children: I,
+    pub fn array_from_iter<T: StaticVariantType>(
+        children: impl IntoIterator<Item = Variant>,
     ) -> Self {
         Self::array_from_iter_with_type(&T::static_variant_type(), children)
     }
@@ -434,9 +434,9 @@ impl Variant {
     ///
     /// This function panics if not all variants are of type `type_`.
     #[doc(alias = "g_variant_new_array")]
-    pub fn array_from_iter_with_type<T: AsRef<Variant>, I: IntoIterator<Item = T>>(
+    pub fn array_from_iter_with_type(
         type_: &VariantTy,
-        children: I,
+        children: impl IntoIterator<Item = impl AsRef<Variant>>,
     ) -> Self {
         unsafe {
             let mut builder = mem::MaybeUninit::uninit();
@@ -1653,7 +1653,7 @@ tuple_impls! {
 
 impl<T: ToVariant + StaticVariantType> FromIterator<T> for Variant {
     fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self {
-        Variant::array_from_iter::<T, _>(iter.into_iter().map(|v| v.to_variant()))
+        Variant::array_from_iter::<T>(iter.into_iter().map(|v| v.to_variant()))
     }
 }
 
@@ -2085,7 +2085,7 @@ mod tests {
 
     #[test]
     fn test_array_from_iter() {
-        let a = Variant::array_from_iter::<String, _>(
+        let a = Variant::array_from_iter::<String>(
             ["foo", "bar", "baz"].into_iter().map(|s| s.to_variant()),
         );
         assert_eq!(a.type_().as_str(), "as");

glib/src/variant_iter.rs

@@ -216,7 +216,7 @@ mod tests {
 
     #[test]
     fn test_variant_iter_array() {
-        let v = Variant::array_from_iter::<String, _>([
+        let v = Variant::array_from_iter::<String>([
             "foo".to_string().to_variant(),
             "bar".to_string().to_variant(),
         ]);
@@ -255,7 +255,7 @@ mod tests {
 
     #[test]
     fn test_variant_iter_nth() {
-        let v = Variant::array_from_iter::<String, _>([
+        let v = Variant::array_from_iter::<String>([
             "0".to_string().to_variant(),
             "1".to_string().to_variant(),
             "2".to_string().to_variant(),
@@ -287,7 +287,7 @@ mod tests {
 
     #[test]
     fn test_variant_iter_count() {
-        let v = Variant::array_from_iter::<String, _>([
+        let v = Variant::array_from_iter::<String>([
             "0".to_string().to_variant(),
             "1".to_string().to_variant(),
             "2".to_string().to_variant(),
@@ -301,7 +301,7 @@ mod tests {
 
     #[test]
     fn test_variant_iter_last() {
-        let v = Variant::array_from_iter::<String, _>([
+        let v = Variant::array_from_iter::<String>([
             "0".to_string().to_variant(),
             "1".to_string().to_variant(),
             "2".to_string().to_variant(),
@@ -318,7 +318,7 @@ mod tests {
 
     #[test]
     fn test_variant_str_iter_nth() {
-        let v = Variant::array_from_iter::<String, _>([
+        let v = Variant::array_from_iter::<String>([
             "0".to_string().to_variant(),
             "1".to_string().to_variant(),
             "2".to_string().to_variant(),
@@ -341,7 +341,7 @@ mod tests {
 
     #[test]
     fn test_variant_str_iter_count() {
-        let v = Variant::array_from_iter::<String, _>([
+        let v = Variant::array_from_iter::<String>([
             "0".to_string().to_variant(),
             "1".to_string().to_variant(),
             "2".to_string().to_variant(),
@@ -355,7 +355,7 @@ mod tests {
 
     #[test]
     fn test_variant_str_iter_last() {
-        let v = Variant::array_from_iter::<String, _>([
+        let v = Variant::array_from_iter::<String>([
             "0".to_string().to_variant(),
             "1".to_string().to_variant(),
             "2".to_string().to_variant(),