Inline most raw socket, fd and handle conversions

4 files changed, 12 insertions, 0 deletions

diff --git a/library/std/src/sys/unix/ext/net/datagram.rs b/library/std/src/sys/unix/ext/net/datagram.rs
index a8c13fbb874..9e39f70f68e 100644
--- a/library/std/src/sys/unix/ext/net/datagram.rs
+++ b/library/std/src/sys/unix/ext/net/datagram.rs
@@ -879,6 +879,7 @@ impl UnixDatagram {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl AsRawFd for UnixDatagram {
+    #[inline]
     fn as_raw_fd(&self) -> RawFd {
         *self.0.as_inner()
     }
@@ -886,6 +887,7 @@ impl AsRawFd for UnixDatagram {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl FromRawFd for UnixDatagram {
+    #[inline]
     unsafe fn from_raw_fd(fd: RawFd) -> UnixDatagram {
         UnixDatagram(Socket::from_inner(fd))
     }
@@ -893,6 +895,7 @@ impl FromRawFd for UnixDatagram {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl IntoRawFd for UnixDatagram {
+    #[inline]
     fn into_raw_fd(self) -> RawFd {
         self.0.into_inner()
     }
diff --git a/library/std/src/sys/unix/ext/net/listener.rs b/library/std/src/sys/unix/ext/net/listener.rs
index 9803c6e2746..bdd08fe8380 100644
--- a/library/std/src/sys/unix/ext/net/listener.rs
+++ b/library/std/src/sys/unix/ext/net/listener.rs
@@ -240,6 +240,7 @@ impl UnixListener {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl AsRawFd for UnixListener {
+    #[inline]
     fn as_raw_fd(&self) -> RawFd {
         *self.0.as_inner()
     }
@@ -247,6 +248,7 @@ impl AsRawFd for UnixListener {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl FromRawFd for UnixListener {
+    #[inline]
     unsafe fn from_raw_fd(fd: RawFd) -> UnixListener {
         UnixListener(Socket::from_inner(fd))
     }
@@ -254,6 +256,7 @@ impl FromRawFd for UnixListener {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl IntoRawFd for UnixListener {
+    #[inline]
     fn into_raw_fd(self) -> RawFd {
         self.0.into_inner()
     }
diff --git a/library/std/src/sys/unix/ext/net/raw_fd.rs b/library/std/src/sys/unix/ext/net/raw_fd.rs
index c42fee4c73b..b3f12844101 100644
--- a/library/std/src/sys/unix/ext/net/raw_fd.rs
+++ b/library/std/src/sys/unix/ext/net/raw_fd.rs
@@ -6,6 +6,7 @@ macro_rules! impl_as_raw_fd {
     ($($t:ident)*) => {$(
         #[stable(feature = "rust1", since = "1.0.0")]
         impl AsRawFd for net::$t {
+            #[inline]
             fn as_raw_fd(&self) -> RawFd {
                 *self.as_inner().socket().as_inner()
             }
@@ -18,6 +19,7 @@ macro_rules! impl_from_raw_fd {
     ($($t:ident)*) => {$(
         #[stable(feature = "from_raw_os", since = "1.1.0")]
         impl FromRawFd for net::$t {
+            #[inline]
             unsafe fn from_raw_fd(fd: RawFd) -> net::$t {
                 let socket = sys::net::Socket::from_inner(fd);
                 net::$t::from_inner(sys_common::net::$t::from_inner(socket))
@@ -31,6 +33,7 @@ macro_rules! impl_into_raw_fd {
     ($($t:ident)*) => {$(
         #[stable(feature = "into_raw_os", since = "1.4.0")]
         impl IntoRawFd for net::$t {
+            #[inline]
             fn into_raw_fd(self) -> RawFd {
                 self.into_inner().into_socket().into_inner()
             }
diff --git a/library/std/src/sys/unix/ext/net/stream.rs b/library/std/src/sys/unix/ext/net/stream.rs
index fc08edacb82..a6f6e091305 100644
--- a/library/std/src/sys/unix/ext/net/stream.rs
+++ b/library/std/src/sys/unix/ext/net/stream.rs
@@ -654,6 +654,7 @@ impl<'a> io::Write for &'a UnixStream {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl AsRawFd for UnixStream {
+    #[inline]
     fn as_raw_fd(&self) -> RawFd {
         *self.0.as_inner()
     }
@@ -661,6 +662,7 @@ impl AsRawFd for UnixStream {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl FromRawFd for UnixStream {
+    #[inline]
     unsafe fn from_raw_fd(fd: RawFd) -> UnixStream {
         UnixStream(Socket::from_inner(fd))
     }
@@ -668,6 +670,7 @@ impl FromRawFd for UnixStream {
 
 #[stable(feature = "unix_socket", since = "1.10.0")]
 impl IntoRawFd for UnixStream {
+    #[inline]
     fn into_raw_fd(self) -> RawFd {
         self.0.into_inner()
     }