Skip to content

Commit 2b8753a

Browse files
fix windows traits
1 parent 186cbb1 commit 2b8753a

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Diff for: src/net/tcp/listener.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ cfg_unix! {
230230

231231
cfg_windows! {
232232
use crate::os::windows::io::{
233-
AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle,
234233
AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket,
235234
};
236235

@@ -242,7 +241,7 @@ cfg_windows! {
242241

243242
impl FromRawSocket for TcpListener {
244243
unsafe fn from_raw_socket(handle: RawSocket) -> TcpListener {
245-
net::TcpListener::from_raw_socket(handle).try_into().unwrap()
244+
std::net::TcpListener::from_raw_socket(handle).into()
246245
}
247246
}
248247

Diff for: src/net/tcp/stream.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -388,17 +388,19 @@ cfg_unix! {
388388
}
389389

390390
cfg_windows! {
391-
use crate::os::windows::io::{AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle, RawSocket, AsRawSocket, FromRawSocket, IntoRawSocket};
391+
use crate::os::windows::io::{
392+
RawSocket, AsRawSocket, FromRawSocket, IntoRawSocket
393+
};
392394

393395
impl AsRawSocket for TcpStream {
394396
fn as_raw_socket(&self) -> RawSocket {
395-
self.raw_socket
397+
self.watcher.get_ref().as_raw_socket()
396398
}
397399
}
398400

399401
impl FromRawSocket for TcpStream {
400402
unsafe fn from_raw_socket(handle: RawSocket) -> TcpStream {
401-
net::TcpStream::from_raw_socket(handle).try_into().unwrap()
403+
std::net::TcpStream::from_raw_socket(handle).into()
402404
}
403405
}
404406

Diff for: src/net/udp/mod.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -482,17 +482,19 @@ cfg_unix! {
482482
}
483483

484484
cfg_windows! {
485-
use crate::os::windows::io::{AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle, RawSocket, AsRawSocket, IntoRawSocket, FromRawSocket};
485+
use crate::os::windows::io::{
486+
RawSocket, AsRawSocket, IntoRawSocket, FromRawSocket
487+
};
486488

487489
impl AsRawSocket for UdpSocket {
488490
fn as_raw_socket(&self) -> RawSocket {
489-
self.watcher.as_raw_socket()
491+
self.watcher.get_ref().as_raw_socket()
490492
}
491493
}
492494

493495
impl FromRawSocket for UdpSocket {
494496
unsafe fn from_raw_socket(handle: RawSocket) -> UdpSocket {
495-
net::UdpSocket::from_raw_socket(handle).into()
497+
std::net::UdpSocket::from_raw_socket(handle).into()
496498
}
497499
}
498500

0 commit comments

Comments
 (0)