From e0928463b166aba813c23c6fcc79f1a0204980a7 Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Tue, 28 Apr 2020 11:16:36 +0200
Subject: [PATCH] fix windows traits

---
 src/net/tcp/listener.rs | 3 +--
 src/net/tcp/stream.rs   | 8 +++++---
 src/net/udp/mod.rs      | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/net/tcp/listener.rs b/src/net/tcp/listener.rs
index 49ee4f4..72c5d3a 100644
--- a/src/net/tcp/listener.rs
+++ b/src/net/tcp/listener.rs
@@ -230,7 +230,6 @@ cfg_unix! {
 
 cfg_windows! {
     use crate::os::windows::io::{
-        AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle,
         AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket,
     };
 
@@ -242,7 +241,7 @@ cfg_windows! {
 
     impl FromRawSocket for TcpListener {
         unsafe fn from_raw_socket(handle: RawSocket) -> TcpListener {
-            net::TcpListener::from_raw_socket(handle).try_into().unwrap()
+            std::net::TcpListener::from_raw_socket(handle).into()
         }
     }
 
diff --git a/src/net/tcp/stream.rs b/src/net/tcp/stream.rs
index 7b71f98..b854143 100644
--- a/src/net/tcp/stream.rs
+++ b/src/net/tcp/stream.rs
@@ -388,17 +388,19 @@ cfg_unix! {
 }
 
 cfg_windows! {
-    use crate::os::windows::io::{AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle, RawSocket, AsRawSocket, FromRawSocket, IntoRawSocket};
+    use crate::os::windows::io::{
+        RawSocket, AsRawSocket, FromRawSocket, IntoRawSocket
+    };
 
     impl AsRawSocket for TcpStream {
         fn as_raw_socket(&self) -> RawSocket {
-            self.raw_socket
+            self.watcher.get_ref().as_raw_socket()
         }
     }
 
     impl FromRawSocket for TcpStream {
         unsafe fn from_raw_socket(handle: RawSocket) -> TcpStream {
-            net::TcpStream::from_raw_socket(handle).try_into().unwrap()
+            std::net::TcpStream::from_raw_socket(handle).into()
         }
     }
 
diff --git a/src/net/udp/mod.rs b/src/net/udp/mod.rs
index 53add8e..30cceb7 100644
--- a/src/net/udp/mod.rs
+++ b/src/net/udp/mod.rs
@@ -482,17 +482,19 @@ cfg_unix! {
 }
 
 cfg_windows! {
-    use crate::os::windows::io::{AsRawHandle, FromRawHandle, IntoRawHandle, RawHandle, RawSocket, AsRawSocket, IntoRawSocket, FromRawSocket};
+    use crate::os::windows::io::{
+        RawSocket, AsRawSocket, IntoRawSocket, FromRawSocket
+    };
 
     impl AsRawSocket for UdpSocket {
         fn as_raw_socket(&self) -> RawSocket {
-            self.watcher.as_raw_socket()
+            self.watcher.get_ref().as_raw_socket()
         }
     }
 
     impl FromRawSocket for UdpSocket {
         unsafe fn from_raw_socket(handle: RawSocket) -> UdpSocket {
-            net::UdpSocket::from_raw_socket(handle).into()
+            std::net::UdpSocket::from_raw_socket(handle).into()
         }
     }