about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-01-18 10:26:12 +0000
committerbors <bors@rust-lang.org>2023-01-18 10:26:12 +0000
commit1f72129ffe5e8c495113f9a2d4e1730f7fad3209 (patch)
tree2b23072899d2c9caedcf05edfab580b746e926da /library/std/src
parent74c1ad5d35c7fbdb834c42144d966279fdff3679 (diff)
parent43b1e732db5466148afda10d6e78c871ab2d91b3 (diff)
downloadrust-1f72129ffe5e8c495113f9a2d4e1730f7fad3209.tar.gz
rust-1f72129ffe5e8c495113f9a2d4e1730f7fad3209.zip
Auto merge of #107026 - Dylan-DPC:rollup-4fonvdc, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #103702 (Lift `T: Sized` bounds from some `strict_provenance` pointer methods)
 - #106441 (relax reference requirement on SocketAddrExt::from_abstract_name)
 - #106718 (finish trait solver skeleton work)
 - #106950 (Don't do pointer arithmetic on pointers to deallocated memory)
 - #107014 (rustdoc: remove deprecated / unused code from main.js)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/os/net/linux_ext/addr.rs2
-rw-r--r--library/std/src/os/unix/net/addr.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/os/net/linux_ext/addr.rs b/library/std/src/os/net/linux_ext/addr.rs
index df3fc8e6a3b..85065984fbb 100644
--- a/library/std/src/os/net/linux_ext/addr.rs
+++ b/library/std/src/os/net/linux_ext/addr.rs
@@ -38,7 +38,7 @@ pub trait SocketAddrExt: Sealed {
     ///     Ok(())
     /// }
     /// ```
-    fn from_abstract_name<N>(name: &N) -> crate::io::Result<SocketAddr>
+    fn from_abstract_name<N>(name: N) -> crate::io::Result<SocketAddr>
     where
         N: AsRef<[u8]>;
 
diff --git a/library/std/src/os/unix/net/addr.rs b/library/std/src/os/unix/net/addr.rs
index 81ac829d21b..ece2b33bddf 100644
--- a/library/std/src/os/unix/net/addr.rs
+++ b/library/std/src/os/unix/net/addr.rs
@@ -256,7 +256,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
         if let AddressKind::Abstract(name) = self.address() { Some(name) } else { None }
     }
 
-    fn from_abstract_name<N>(name: &N) -> crate::io::Result<Self>
+    fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
     where
         N: AsRef<[u8]>,
     {