diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-08-02 07:30:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 07:30:45 +0200 |
| commit | 042bba799b3e8f1145c684138472464e5535dd27 (patch) | |
| tree | c51e3064187ce6b433587dafc21d6b855545778b | |
| parent | beb4cdddde0421710d548da5a847efec0d515343 (diff) | |
| parent | bfbda8110720d3a467b2c791bcaa18531df43a3a (diff) | |
| download | rust-042bba799b3e8f1145c684138472464e5535dd27.tar.gz rust-042bba799b3e8f1145c684138472464e5535dd27.zip | |
Rollup merge of #100017 - solid-rs:patch/kmc-solid/adapt-to-78802, r=thomcc
kmc-solid: Update `Socket::connect_timeout` to be in line with #78802
Fixes the build failure of the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets after #78802.
```
error[E0308]: mismatched types
--> library\std\src\sys\solid\net.rs:234:45
|
234 | cvt(netc::connect(self.0.raw(), addrp, len))
| ------------- ^^^^^ expected *-ptr, found union `SocketAddrCRepr`
| |
| arguments to this function are incorrect
|
= note: expected raw pointer `*const sockets::sockaddr`
found union `SocketAddrCRepr`
note: function defined here
--> library\std\src\sys\solid\abi\sockets.rs:173:12
|
173 | pub fn connect(s: c_int, name: *const sockaddr, namelen: socklen_t) -> c_int;
| ^^^^^^^
```
| -rw-r--r-- | library/std/src/sys/solid/net.rs | 4 |
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)?; |
