From 52fd0aefaa7aef828c4d8360a67098b9168b538b Mon Sep 17 00:00:00 2001
From: Meitian Huang <_@freeaddr.info>
Date: Wed, 23 Mar 2016 13:30:35 +1100
Subject: [PATCH] Update dependency ``byteorder`` from 0.3.x to 0.5.x

---
 Cargo.toml          |  2 +-
 src/relay/socks5.rs | 63 +++++----------------------------------------
 2 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 259b8d2e..6a620d5e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ path = "src/bin/ssurl.rs"
 [dependencies]
 rustc-serialize = "^0.3.15"
 log = "^0.3.1"
-byteorder = "^0.3.11"
+byteorder = "^0.5.0"
 rand = "^0.3.9"
 time = "^0.1.32"
 clap = "^1.1.6"
diff --git a/src/relay/socks5.rs b/src/relay/socks5.rs
index aa3c6886..00fc4505 100644
--- a/src/relay/socks5.rs
+++ b/src/relay/socks5.rs
@@ -28,7 +28,7 @@ use std::vec;
 use std::error;
 use std::convert::From;
 
-use byteorder::{self, ReadBytesExt, WriteBytesExt, BigEndian};
+use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian};
 
 const SOCKS5_VERSION : u8 = 0x05;
 
@@ -178,13 +178,6 @@ impl From<io::Error> for Error {
     }
 }
 
-impl From<byteorder::Error> for Error {
-    fn from(err: byteorder::Error) -> Error {
-        let io_err: io::Error = <io::Error as From<byteorder::Error>>::from(err);
-        <Error as From<io::Error>>::from(io_err)
-    }
-}
-
 #[derive(Clone, PartialEq, Eq, Hash)]
 pub enum Address {
     SocketAddress(SocketAddr),
@@ -391,61 +384,19 @@ fn write_addr<W: Write + Sized>(addr: &Address, buf: &mut W) -> io::Result<()> {
                     try!(buf.write_all(&addr.ip().octets()));
                 },
                 SocketAddr::V6(addr) => {
-                    try!(buf.write_u8(SOCKS5_ADDR_TYPE_IPV6).map_err(|err| {
-                        match err {
-                            byteorder::Error::UnexpectedEOF => {
-                                io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
-                            },
-                            byteorder::Error::Io(err) => err
-                        }
-                    }));
+                    try!(buf.write_u8(SOCKS5_ADDR_TYPE_IPV6));
                     for seg in addr.ip().segments().iter() {
-                        try!(buf.write_u16::<BigEndian>(*seg).map_err(|err| {
-                            match err {
-                                byteorder::Error::UnexpectedEOF => {
-                                    io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
-                                },
-                                byteorder::Error::Io(err) => err
-                            }
-                        }));
+                        try!(buf.write_u16::<BigEndian>(*seg));
                     }
                 }
             }
-            try!(buf.write_u16::<BigEndian>(addr.port()).map_err(|err| {
-                        match err {
-                            byteorder::Error::UnexpectedEOF => {
-                                io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
-                            },
-                            byteorder::Error::Io(err) => err
-                        }
-                    }));
+            try!(buf.write_u16::<BigEndian>(addr.port()));
         },
         &Address::DomainNameAddress(ref dnaddr, port) => {
-            try!(buf.write_u8(SOCKS5_ADDR_TYPE_DOMAIN_NAME).map_err(|err| {
-                        match err {
-                            byteorder::Error::UnexpectedEOF => {
-                                io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
-                            },
-                            byteorder::Error::Io(err) => err
-                        }
-                    }));
-            try!(buf.write_u8(dnaddr.len() as u8).map_err(|err| {
-                        match err {
-                            byteorder::Error::UnexpectedEOF => {
-                                io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
-                            },
-                            byteorder::Error::Io(err) => err
-                        }
-                    }));
+            try!(buf.write_u8(SOCKS5_ADDR_TYPE_DOMAIN_NAME));
+            try!(buf.write_u8(dnaddr.len() as u8));
             try!(buf.write_all(dnaddr[..].as_bytes()));
-            try!(buf.write_u16::<BigEndian>(port).map_err(|err| {
-                        match err {
-                            byteorder::Error::UnexpectedEOF => {
-                                io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
-                            },
-                            byteorder::Error::Io(err) => err
-                        }
-                    }));
+            try!(buf.write_u16::<BigEndian>(port));
         }
     }