Use safe-io

For the from_owned_fd it might make sense to implement From or replace
the unsafe from_fd/take_fd methods.

Author: A6GibKm

gio/src/desktop_app_info.rs

@@ -3,7 +3,7 @@
 #[cfg(any(all(feature = "v2_58", unix), all(unix, feature = "dox")))]
 use std::boxed::Box as Box_;
 #[cfg(any(all(feature = "v2_58", unix), all(unix, feature = "dox")))]
-use std::os::unix::io::AsRawFd;
+use std::os::unix::io::{AsFd, AsRawFd};
 #[cfg(any(all(feature = "v2_58", unix), all(unix, feature = "dox")))]
 use std::ptr;
 
@@ -48,12 +48,7 @@ pub trait DesktopAppInfoExtManual {
     #[cfg(any(all(feature = "v2_58", unix), all(unix, feature = "dox")))]
     #[cfg_attr(feature = "dox", 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<
-        P: IsA<AppLaunchContext>,
-        T: AsRawFd,
-        U: AsRawFd,
-        V: AsRawFd,
-    >(
+    fn launch_uris_as_manager_with_fds<P: IsA<AppLaunchContext>, T: AsFd, U: AsFd, V: AsFd>(
         &self,
         uris: &[&str],
         launch_context: Option<&P>,
@@ -69,12 +64,7 @@ pub trait DesktopAppInfoExtManual {
 impl<O: IsA<DesktopAppInfo>> DesktopAppInfoExtManual for O {
     #[cfg(any(all(feature = "v2_58", unix), all(unix, feature = "dox")))]
     #[cfg_attr(feature = "dox", doc(cfg(all(feature = "v2_58", unix))))]
-    fn launch_uris_as_manager_with_fds<
-        P: IsA<AppLaunchContext>,
-        T: AsRawFd,
-        U: AsRawFd,
-        V: AsRawFd,
-    >(
+    fn launch_uris_as_manager_with_fds<P: IsA<AppLaunchContext>, T: AsFd, U: AsFd, V: AsFd>(
         &self,
         uris: &[&str],
         launch_context: Option<&P>,
@@ -135,9 +125,9 @@ impl<O: IsA<DesktopAppInfo>> DesktopAppInfoExtManual for O {
                 Box_::into_raw(super_callback0) as *mut _,
                 pid_callback,
                 super_callback1 as *const _ as usize as *mut _,
-                stdin_fd.as_raw_fd(),
-                stdout_fd.as_raw_fd(),
-                stderr_fd.as_raw_fd(),
+                stdin_fd.as_fd().as_raw_fd(),
+                stdout_fd.as_fd().as_raw_fd(),
+                stderr_fd.as_fd().as_raw_fd(),
                 &mut error,
             );
             if error.is_null() {

gio/src/socket.rs

@@ -5,7 +5,7 @@ use std::os::raw::c_int;
 #[cfg(all(not(windows), feature = "dox"))]
 use std::os::raw::c_void;
 #[cfg(unix)]
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 #[cfg(windows)]
 use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
 #[cfg(any(feature = "v2_60", feature = "dox"))]
@@ -31,6 +31,13 @@ impl Socket {
             Err(from_glib_full(error))
         }
     }
+    #[cfg(any(unix, feature = "dox"))]
+    pub fn from_owned_fd(fd: OwnedFd) -> Result<Socket, glib::Error> {
+        unsafe {
+            let fd = fd.into_raw_fd();
+            Socket::from_fd(fd)
+        }
+    }
     #[cfg(any(windows, feature = "dox"))]
     pub unsafe fn from_socket(socket: impl IntoRawSocket) -> Result<Socket, glib::Error> {
         let socket = socket.into_raw_socket();

gio/src/unix_input_stream.rs

@@ -1,11 +1,11 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #[cfg(unix)]
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 
 use glib::{prelude::*, translate::*};
 #[cfg(all(not(unix), feature = "dox"))]
-use socket::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use socket::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 
 use crate::{InputStream, UnixInputStream};
 
@@ -35,6 +35,16 @@ impl UnixInputStream {
         let close_fd = false.into_glib();
         InputStream::from_glib_full(ffi::g_unix_input_stream_new(fd, close_fd)).unsafe_cast()
     }
+
+    // rustdoc-stripper-ignore-next
+    /// Creates a new [`Self`] that takes ownership of the passed in fd.
+    #[doc(alias = "g_unix_input_stream_new")]
+    pub fn from_owned_fd(fd: OwnedFd) -> UnixInputStream {
+        unsafe {
+            let fd = fd.into_raw_fd();
+            UnixInputStream::take_fd(fd)
+        }
+    }
 }
 
 impl AsRawFd for UnixInputStream {

gio/src/unix_output_stream.rs

@@ -1,11 +1,11 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #[cfg(unix)]
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 
 use glib::{prelude::*, translate::*};
 #[cfg(all(not(unix), feature = "dox"))]
-use socket::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use socket::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 
 use crate::{OutputStream, UnixOutputStream};
 
@@ -35,6 +35,16 @@ impl UnixOutputStream {
         let close_fd = false.into_glib();
         OutputStream::from_glib_full(ffi::g_unix_output_stream_new(fd, close_fd)).unsafe_cast()
     }
+
+    // rustdoc-stripper-ignore-next
+    /// Creates a new [`Self`] that takes ownership of the passed in fd.
+    #[doc(alias = "g_unix_output_stream_new")]
+    pub fn from_owned_fd(fd: OwnedFd) -> Self {
+        unsafe {
+            let fd = fd.into_raw_fd();
+            UnixOutputStream::take_fd(fd)
+        }
+    }
 }
 
 impl AsRawFd for UnixOutputStream {

glib/src/functions.rs

@@ -8,7 +8,7 @@ use std::mem;
 #[cfg(any(feature = "v2_58", feature = "dox"))]
 use std::os::unix::io::AsRawFd;
 #[cfg(not(windows))]
-use std::os::unix::io::{FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsFd, FromRawFd, IntoRawFd, RawFd};
 use std::ptr;
 
 // #[cfg(windows)]
@@ -23,7 +23,7 @@ use crate::{Error, Pid, SpawnFlags};
 #[cfg_attr(feature = "dox", doc(cfg(all(feature = "v2_58", not(windows)))))]
 #[allow(clippy::too_many_arguments)]
 #[doc(alias = "g_spawn_async_with_fds")]
-pub fn spawn_async_with_fds<P: AsRef<std::path::Path>, T: AsRawFd, U: AsRawFd, V: AsRawFd>(
+pub fn spawn_async_with_fds<P: AsRef<std::path::Path>, T: AsFd, U: AsFd, V: AsFd>(
     working_directory: P,
     argv: &[&str],
     envp: &[&str],
@@ -57,9 +57,9 @@ pub fn spawn_async_with_fds<P: AsRef<std::path::Path>, T: AsRawFd, U: AsRawFd, V
             child_setup,
             Box_::into_raw(super_callback0) as *mut _,
             child_pid.as_mut_ptr(),
-            stdin_fd.as_raw_fd(),
-            stdout_fd.as_raw_fd(),
-            stderr_fd.as_raw_fd(),
+            stdin_fd.as_fd().as_raw_fd(),
+            stdout_fd.as_fd().as_raw_fd(),
+            stderr_fd.as_fd().as_raw_fd(),
             &mut error,
         );
         let child_pid = from_glib(child_pid.assume_init());

glib/src/log.rs

@@ -1,7 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #[cfg(any(unix, feature = "dox"))]
-use std::os::unix::io::AsRawFd;
+use std::os::unix::io::{AsFd, AsRawFd};
 use std::{
     boxed::Box as Box_,
     sync::{Arc, Mutex},
@@ -958,15 +958,19 @@ pub fn log_variant(log_domain: Option<&str>, log_level: LogLevel, fields: &crate
 #[cfg(any(unix, feature = "dox"))]
 #[doc(alias = "g_log_writer_supports_color")]
 #[inline]
-pub fn log_writer_supports_color<T: AsRawFd>(output_fd: T) -> bool {
-    unsafe { from_glib(ffi::g_log_writer_supports_color(output_fd.as_raw_fd())) }
+pub fn log_writer_supports_color<T: AsFd>(output_fd: T) -> bool {
+    unsafe {
+        from_glib(ffi::g_log_writer_supports_color(
+            output_fd.as_fd().as_raw_fd(),
+        ))
+    }
 }
 
 #[cfg(any(unix, feature = "dox"))]
 #[doc(alias = "g_log_writer_is_journald")]
 #[inline]
-pub fn log_writer_is_journald<T: AsRawFd>(output_fd: T) -> bool {
-    unsafe { from_glib(ffi::g_log_writer_is_journald(output_fd.as_raw_fd())) }
+pub fn log_writer_is_journald<T: AsFd>(output_fd: T) -> bool {
+    unsafe { from_glib(ffi::g_log_writer_is_journald(output_fd.as_fd().as_raw_fd())) }
 }
 
 #[doc(alias = "g_log_writer_format_fields")]