commit 15c0c0d448456e549d0b19a01e42e7ec45c69d22
author Ahmed Charles <acharles@outlook.com> Tue Aug 22 07:04:35 2017 -0700
committer Alex Crichton <alex@alexcrichton.com> Tue Aug 22 09:04:35 2017 -0500
tree 45f56abdab75c0307b99cf4e07cebdf85d8d6070
parent a3a03dd23b2ad4a2d9855e577f96c5d5f2d54efd

Remove uses of the deprecated udp module. (#706)

test/test_register_multiple_event_loops.rs

diff --git a/test/test_register_multiple_event_loops.rs b/test/test_register_multiple_event_loops.rs
index f3480c7..9204afa 100644
--- a/test/test_register_multiple_event_loops.rs
+++ b/test/test_register_multiple_event_loops.rs
@@ -1,7 +1,6 @@
 use localhost;
 use mio::*;
-use mio::net::{TcpListener, TcpStream};
-use mio::udp::*;
+use mio::net::{TcpListener, TcpStream, UdpSocket};
 use std::io::ErrorKind;
 
 #[test]

test/test_udp_level.rs

diff --git a/test/test_udp_level.rs b/test/test_udp_level.rs
index c394b7f..d4e3937 100644
--- a/test/test_udp_level.rs
+++ b/test/test_udp_level.rs
@@ -1,5 +1,5 @@
 use mio::*;
-use mio::udp::*;
+use mio::net::UdpSocket;
 use {expect_events, sleep_ms};
 
 #[test]
@@ -35,7 +35,7 @@
     }
 
     let mut buf = [0; 200];
-    while rx.recv_from(&mut buf).unwrap().is_some() {}
+    while rx.recv_from(&mut buf).is_ok() {}
 
     for _ in 0..2 {
         expect_events(poll, events, 4, vec![Event::new(Ready::writable(), Token(1))]);

test/test_udp_socket.rs

diff --git a/test/test_udp_socket.rs b/test/test_udp_socket.rs
index f3b4ac2..e8686ee 100644
--- a/test/test_udp_socket.rs
+++ b/test/test_udp_socket.rs
@@ -1,7 +1,8 @@
 use mio::*;
 use mio::deprecated::{Handler, EventLoop};
-use mio::udp::*;
+use mio::net::UdpSocket;
 use bytes::{Buf, RingBuf, SliceBuf, MutBuf};
+use std::io::ErrorKind;
 use std::str;
 use std::time;
 use localhost;
@@ -43,11 +44,9 @@
                     debug!("We are receiving a datagram now...");
                     let cnt = unsafe {
                         if !self.connected {
-                            self.rx.recv_from(self.rx_buf.mut_bytes()).unwrap()
-                                                                      .unwrap().0
+                            self.rx.recv_from(self.rx_buf.mut_bytes()).unwrap().0
                         } else {
                             self.rx.recv(self.rx_buf.mut_bytes()).unwrap()
-                                                                    .unwrap()
                         }
                     };
 
@@ -65,10 +64,8 @@
                     let cnt = if !self.connected {
                         let addr = self.rx.local_addr().unwrap();
                         self.tx.send_to(self.buf.bytes(), &addr).unwrap()
-                                                                .unwrap()
                     } else {
                         self.tx.send(self.buf.bytes()).unwrap()
-                                                      .unwrap()
                     };
 
                     self.buf.advance(cnt);
@@ -119,7 +116,7 @@
 
     // ensure that the sockets are non-blocking
     let mut buf = [0; 128];
-    assert!(rx.recv_from(&mut buf).unwrap().is_none());
+    assert_eq!(ErrorKind::WouldBlock, rx.recv_from(&mut buf).unwrap_err().kind());
 
     info!("Registering SENDER");
     event_loop.register(&tx, SENDER, Ready::writable(), PollOpt::edge()).unwrap();
@@ -178,11 +175,12 @@
 
     let mut event_loop = EventLoop::new().unwrap();
 
-    assert!(udp_outside.send("hello world".as_bytes()).is_ok());
+    let r = udp_outside.send("hello world".as_bytes());
+    assert!(r.is_ok() || r.unwrap_err().kind() == ErrorKind::WouldBlock);
 
     event_loop.register(&rx, LISTENER, Ready::readable(), PollOpt::edge()).unwrap();
     event_loop.register(&tx, SENDER, Ready::writable(), PollOpt::edge()).unwrap();
 
     event_loop.timeout(5000, time::Duration::from_secs(5)).unwrap();
     event_loop.run(&mut UdpHandlerTimeout {}).unwrap();
-}
\ No newline at end of file
+}