Skip to content

Commit 98b7c90

Browse files
committed
Auto merge of #100048 - matthiaskrgr:rollup-agimvm6, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #99156 (`codegen_fulfill_obligation` expect erased regions) - #99293 (only run --all-targets in stage0 for Std) - #99779 (Fix item info pos and height) - #99994 (Remove `guess_head_span`) - #100011 (Use Parser's `restrictions` instead of `let_expr_allowed`) - #100017 (kmc-solid: Update `Socket::connect_timeout` to be in line with #78802) - #100037 (Update rustc man page to match `rustc --help`) - #100042 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1b7929d + 8a327f6 commit 98b7c90

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

std/src/sys/solid/net.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ impl Socket {
230230
pub fn connect_timeout(&self, addr: &SocketAddr, timeout: Duration) -> io::Result<()> {
231231
self.set_nonblocking(true)?;
232232
let r = unsafe {
233-
let (addrp, len) = addr.into_inner();
234-
cvt(netc::connect(self.0.raw(), addrp, len))
233+
let (addr, len) = addr.into_inner();
234+
cvt(netc::connect(self.0.raw(), addr.as_ptr(), len))
235235
};
236236
self.set_nonblocking(false)?;
237237

0 commit comments

Comments
 (0)