Merge pull request #1384 from stlankes/net

remove obsolete usage of poll_on

src/fd/mod.rs

@@ -299,11 +299,7 @@ pub(crate) fn read(fd: FileDescriptor, buf: &mut [u8]) -> io::Result<usize> {
 			}
 		})
 	} else {
-		match poll_on(obj.async_read(buf), Some(Duration::from_secs(2))) {
-			Err(io::Error::ETIME) => block_on(obj.async_read(buf), None),
-			Err(x) => Err(x),
-			Ok(x) => Ok(x),
-		}
+		block_on(obj.async_read(buf), None)
 	}
 }
 
@@ -329,11 +325,7 @@ pub(crate) fn write(fd: FileDescriptor, buf: &[u8]) -> io::Result<usize> {
 			}
 		})
 	} else {
-		match poll_on(obj.async_write(buf), Some(Duration::from_secs(2))) {
-			Err(io::Error::ETIME) => block_on(obj.async_write(buf), None),
-			Err(x) => Err(x),
-			Ok(x) => Ok(x),
-		}
+		block_on(obj.async_write(buf), None)
 	}
 }
 

src/fd/socket/udp.rs

@@ -185,7 +185,7 @@ impl ObjectInterface for Socket {
 					Some(Duration::ZERO.into()),
 				)
 			} else {
-				poll_on(self.async_write_with_meta(buf, &meta), None)
+				block_on(self.async_write_with_meta(buf, &meta), None)
 			}
 		} else {
 			Err(io::Error::EIO)
@@ -202,14 +202,7 @@ impl ObjectInterface for Socket {
 				}
 			})
 		} else {
-			match poll_on(
-				self.async_recvfrom(buf),
-				Some(Duration::from_secs(2).into()),
-			) {
-				Err(io::Error::ETIME) => block_on(self.async_recvfrom(buf), None),
-				Err(x) => Err(x),
-				Ok(x) => Ok(x),
-			}
+			block_on(self.async_recvfrom(buf), None)
 		}
 	}