changes from ACP feedback

Author: devnexen

library/std/src/os/unix/net/datagram.rs

@@ -16,7 +16,7 @@ use libc::MSG_NOSIGNAL;
 use super::{recv_vectored_with_ancillary_from, send_vectored_with_ancillary_to, SocketAncillary};
 use super::{sockaddr_un, SocketAddr};
 #[cfg(any(doc, target_os = "linux", target_os = "haiku", target_os = "vxworks",))]
-use crate::ffi::{CStr, CString};
+use crate::ffi::CString;
 #[cfg(any(doc, target_os = "android", target_os = "linux"))]
 use crate::io::{IoSlice, IoSliceMut};
 use crate::net::Shutdown;
@@ -848,19 +848,19 @@ impl UnixDatagram {
         not(any(target_os = "linux", target_os = "haiku", target_os = "vxworks")),
         doc = "```ignore"
     )]
-    /// #![feature(unix_set_todevice)]
+    /// #![feature(unix_set_device)]
     /// use std::os::unix::net::UnixDatagram;
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let socket = UnixDatagram::unbound()?;
-    ///     socket.set_todevice(c"eth0")?;
+    ///     socket.set_device("eth0")?;
     ///     Ok(())
     /// }
     /// ```
     #[cfg(any(doc, target_os = "linux", target_os = "haiku", target_os = "vxworks",))]
-    #[unstable(feature = "unix_set_todevice", issue = "129182")]
-    pub fn set_todevice(&self, ifrname: &CStr) -> io::Result<()> {
-        self.0.set_todevice(ifrname)
+    #[unstable(feature = "unix_set_device", issue = "129182")]
+    pub fn set_device(&self, ifrname: &str) -> io::Result<()> {
+        self.0.set_device(ifrname)
     }
 
     /// Get the interface this socket is bound to
@@ -873,21 +873,21 @@ impl UnixDatagram {
         not(any(target_os = "linux", target_os = "haiku", target_os = "vxworks")),
         doc = "```ignore"
     )]
-    /// #![feature(unix_set_todevice)]
+    /// #![feature(unix_set_device)]
     /// use std::os::unix::net::UnixDatagram;
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let socket = UnixDatagram::unbound()?;
-    ///     socket.set_todevice(c"eth0")?;
-    ///     let name = socket.todevice()?;
+    ///     socket.set_device("eth0")?;
+    ///     let name = socket.device()?;
     ///     assert_eq!(Ok("eth0"), name.to_str());
     ///     Ok(())
     /// }
     /// ```
     #[cfg(any(doc, target_os = "linux", target_os = "haiku", target_os = "vxworks",))]
-    #[unstable(feature = "unix_set_todevice", issue = "129182")]
-    pub fn todevice(&self) -> io::Result<CString> {
-        self.0.todevice()
+    #[unstable(feature = "unix_set_device", issue = "129182")]
+    pub fn device(&self) -> io::Result<CString> {
+        self.0.device()
     }
     /// Returns the value of the `SO_ERROR` option.
     ///

library/std/src/os/unix/net/stream.rs

@@ -13,7 +13,7 @@ use super::{peer_cred, UCred};
 use super::{recv_vectored_with_ancillary_from, send_vectored_with_ancillary_to, SocketAncillary};
 use super::{sockaddr_un, SocketAddr};
 #[cfg(any(doc, target_os = "linux", target_os = "haiku", target_os = "vxworks",))]
-use crate::ffi::{CStr, CString};
+use crate::ffi::CString;
 use crate::fmt;
 use crate::io::{self, IoSlice, IoSliceMut};
 use crate::net::Shutdown;
@@ -417,19 +417,19 @@ impl UnixStream {
         not(any(target_os = "linux", target_os = "haiku", target_os = "vxworks")),
         doc = "```ignore"
     )]
-    /// #![feature(unix_set_todevice)]
+    /// #![feature(unix_set_device)]
     /// use std::os::unix::net::UnixStream;
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let socket = UnixStream::connect("/tmp/sock")?;
-    ///     socket.set_todevice(c"eth0")?;
+    ///     socket.set_device("eth0")?;
     ///     Ok(())
     /// }
     /// ```
     #[cfg(any(doc, target_os = "linux", target_os = "haiku", target_os = "vxworks",))]
-    #[unstable(feature = "unix_set_todevice", issue = "129182")]
-    pub fn set_todevice(&self, ifrname: &CStr) -> io::Result<()> {
-        self.0.set_todevice(ifrname)
+    #[unstable(feature = "unix_set_device", issue = "129182")]
+    pub fn set_device(&self, ifrname: &str) -> io::Result<()> {
+        self.0.set_device(ifrname)
     }
 
     /// Get the interface this socket is bound to
@@ -442,21 +442,21 @@ impl UnixStream {
         not(any(target_os = "linux", target_os = "haiku", target_os = "vxworks")),
         doc = "```ignore"
     )]
-    /// #![feature(unix_set_todevice)]
+    /// #![feature(unix_set_device)]
     /// use std::os::unix::net::UnixStream;
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let socket = UnixStream::connect("/tmp/sock")?;
-    ///     socket.set_todevice(c"eth0")?;
-    ///     let name = socket.todevice()?;
+    ///     socket.set_device("eth0")?;
+    ///     let name = socket.device()?;
     ///     assert_eq!(Ok("eth0"), name.to_str());
     ///     Ok(())
     /// }
     /// ```
     #[cfg(any(doc, target_os = "linux", target_os = "haiku", target_os = "vxworks",))]
-    #[unstable(feature = "unix_set_todevice", issue = "129182")]
-    pub fn todevice(&self) -> io::Result<CString> {
-        self.0.todevice()
+    #[unstable(feature = "unix_set_device", issue = "129182")]
+    pub fn device(&self) -> io::Result<CString> {
+        self.0.device()
     }
 
     /// Returns the value of the `SO_ERROR` option.

library/std/src/sys/pal/unix/net.rs

@@ -564,7 +564,7 @@ impl Socket {
     }
 
     #[cfg(any(target_os = "linux", target_os = "haiku", target_os = "vxworks"))]
-    pub fn todevice(&self) -> io::Result<crate::ffi::CString> {
+    pub fn device(&self) -> io::Result<crate::ffi::CString> {
         let buf: [libc::c_char; libc::IFNAMSIZ] =
             getsockopt(self, libc::SOL_SOCKET, libc::SO_BINDTODEVICE)?;
         let s: &[u8] = unsafe { core::slice::from_raw_parts(buf.as_ptr() as *const u8, buf.len()) };
@@ -573,8 +573,8 @@ impl Socket {
     }
 
     #[cfg(any(target_os = "linux", target_os = "haiku", target_os = "vxworks"))]
-    pub fn set_todevice(&self, ifrname: &CStr) -> io::Result<()> {
-        let istr = ifrname.to_bytes();
+    pub fn set_device(&self, ifrname: &str) -> io::Result<()> {
+        let istr = ifrname.as_bytes();
 
         if istr.len() >= libc::IFNAMSIZ {
             return Err(io::Error::from_raw_os_error(libc::ENAMETOOLONG));