about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTomoaki Kawada <kawada@kmckk.co.jp>2022-08-01 15:19:25 +0900
committerTomoaki Kawada <kawada@kmckk.co.jp>2022-08-01 16:08:24 +0900
commitbfbda8110720d3a467b2c791bcaa18531df43a3a (patch)
tree1e505f752cccb4bc04322822411778d947b2415f
parent6423ab3a755fed97f75b2361849155d4e996d02f (diff)
downloadrust-bfbda8110720d3a467b2c791bcaa18531df43a3a.tar.gz
rust-bfbda8110720d3a467b2c791bcaa18531df43a3a.zip
kmc-solid: Adapt to a recent change in the `IntoInner` impl of `SocketAddr`
`(x: SocketAddr).into_inner()` evaluates to `(SocketAddrCRepr,
socklen_t)` instead of `(*const sockaddr, socklen_t)` as of
commit 55e23db13.
-rw-r--r--library/std/src/sys/solid/net.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/solid/net.rs b/library/std/src/sys/solid/net.rs
index faeda5a854d..1b98ef993b0 100644
--- a/library/std/src/sys/solid/net.rs
+++ b/library/std/src/sys/solid/net.rs
@@ -230,8 +230,8 @@ impl Socket {
     pub fn connect_timeout(&self, addr: &SocketAddr, timeout: Duration) -> io::Result<()> {
         self.set_nonblocking(true)?;
         let r = unsafe {
-            let (addrp, len) = addr.into_inner();
-            cvt(netc::connect(self.0.raw(), addrp, len))
+            let (addr, len) = addr.into_inner();
+            cvt(netc::connect(self.0.raw(), addr.as_ptr(), len))
         };
         self.set_nonblocking(false)?;