Merge pull request #75 from jaysonsantos/upgrade-byteorder

Upgrade byteorder to 0.5.1

Author: cyderize

Cargo.toml

@@ -24,7 +24,7 @@ url = "0.5.0"
 rustc-serialize = "0.3.16"
 bitflags = "0.3.3"
 rand = "0.3.12"
-byteorder = "0.4.2"
+byteorder = "0.5.1"
 net2 = "0.2.17"
 
 [features]

src/result.rs

@@ -8,7 +8,6 @@ use std::fmt;
 use openssl::ssl::error::SslError;
 use hyper::Error as HttpError;
 use url::ParseError;
-use byteorder;
 
 /// The type used for WebSocket results
 pub type WebSocketResult<T> = Result<T, WebSocketError>;
@@ -80,6 +79,9 @@ impl Error for WebSocketError {
 
 impl From<io::Error> for WebSocketError {
 	fn from(err: io::Error) -> WebSocketError {
+		if err.kind() == io::ErrorKind::UnexpectedEof {
+			return WebSocketError::NoDataAvailable;
+		}
 		WebSocketError::IoError(err)
 	}
 }
@@ -108,15 +110,6 @@ impl From<Utf8Error> for WebSocketError {
 	}
 }
 
-impl From<byteorder::Error> for WebSocketError {
-	fn from(err: byteorder::Error) -> WebSocketError {
-		match err {
-			byteorder::Error::UnexpectedEOF => WebSocketError::NoDataAvailable,
-			byteorder::Error::Io(err) => From::from(err)
-		}
-	}
-}
-
 impl From<WSUrlErrorKind> for WebSocketError {
     fn from(err: WSUrlErrorKind) -> WebSocketError {
         WebSocketError::WebSocketUrlError(err)