Rollup merge of rust-lang#83831 - AngelicosPhosphoros:issue-77583-inline-for-ip, r=m-ou-se

Dylan-DPC · web-flow · commit 15974160b99c · 2021-04-05T13:03:42.000+02:00
Add `#[inline]` to IpAddr methods Add some inlines to trivial methods of IpAddr Closes rust-lang#77583
diff --git a/std/src/net/ip.rs b/std/src/net/ip.rs
@@ -993,6 +993,7 @@ impl Ord for Ipv4Addr {
 }
 
 impl IntoInner<c::in_addr> for Ipv4Addr {
+    #[inline]
     fn into_inner(self) -> c::in_addr {
         self.inner
     }
@@ -1800,11 +1801,13 @@ impl Ord for Ipv6Addr {
 }
 
 impl AsInner<c::in6_addr> for Ipv6Addr {
+    #[inline]
     fn as_inner(&self) -> &c::in6_addr {
         &self.inner
     }
 }
 impl FromInner<c::in6_addr> for Ipv6Addr {
+    #[inline]
     fn from_inner(addr: c::in6_addr) -> Ipv6Addr {
         Ipv6Addr { inner: addr }
     }

Original file line number	Diff line number	Diff line change
`@@ -993,6 +993,7 @@ impl Ord for Ipv4Addr {`
`993`	`993`	`}`
`994`	`994`
`995`	`995`	`impl IntoInner<c::in_addr> for Ipv4Addr {`
	`996`	`+ #[inline]`
`996`	`997`	`fn into_inner(self) -> c::in_addr {`
`997`	`998`	`self.inner`
`998`	`999`	`}`
`@@ -1800,11 +1801,13 @@ impl Ord for Ipv6Addr {`
`1800`	`1801`	`}`
`1801`	`1802`
`1802`	`1803`	`impl AsInner<c::in6_addr> for Ipv6Addr {`
	`1804`	`+ #[inline]`
`1803`	`1805`	`fn as_inner(&self) -> &c::in6_addr {`
`1804`	`1806`	`&self.inner`
`1805`	`1807`	`}`
`1806`	`1808`	`}`
`1807`	`1809`	`impl FromInner<c::in6_addr> for Ipv6Addr {`
	`1810`	`+ #[inline]`
`1808`	`1811`	`fn from_inner(addr: c::in6_addr) -> Ipv6Addr {`
`1809`	`1812`	`Ipv6Addr { inner: addr }`
`1810`	`1813`	`}`