Use error-chain for error handling

Author: dylanmckay

Cargo.toml

@@ -17,4 +17,5 @@ default = []
 byteorder = "1.0"
 flate2 = { version = "0.2", features = ["zlib"], default-features = false }
 uuid = { version = "0.5", optional = true }
+error-chain = "0.10"
 

src/error.rs

@@ -0,0 +1,24 @@
+use std;
+
+error_chain! {
+    types {
+        Error, ErrorKind, ResultExt;
+    }
+
+    foreign_links {
+        Io(std::io::Error);
+        FromUtf8(std::string::FromUtf8Error);
+        TryFromIntError(std::num::TryFromIntError);
+        CharTryFromError(std::char::CharTryFromError);
+
+        UuidParseError(::uuid::ParseError) #[cfg(feature = "uuid")];
+    }
+
+    errors {
+        UnknownPacketId {
+            description("unknown packet identifier")
+            display("unknown packet identifier")
+        }
+    }
+}
+

src/errors.rs

@@ -7,20 +7,24 @@
 
 pub use self::primitives::{Integer, DynArray, String};
 pub use self::parcel::Parcel;
-pub use self::error::Error;
+pub use self::errors::{Error, ErrorKind, ResultExt};
 
+// Must go first because it defines common macros.
 #[macro_use]
-pub mod primitives;
+mod packet;
 
-mod parcel;
 #[macro_use]
-mod packet;
-mod error;
+pub mod primitives;
 #[macro_use]
 pub mod wire;
 
+mod errors;
+mod parcel;
+
 extern crate byteorder;
 extern crate flate2;
+#[macro_use]
+extern crate error_chain;
 
 #[cfg(feature = "uuid")]
 extern crate uuid;

src/lib.rs

@@ -80,7 +80,7 @@ macro_rules! define_packet_kind
 
                 let packet = match packet_id {
                     $( $packet_id => $ty::$packet_ty(<$packet_ty as $crate::Parcel>::read(read)?), )+
-                    _ => return Err($crate::Error::UnknownPacketId),
+                    _ => return Err($crate::ErrorKind::UnknownPacketId.into()),
                 };
 
                 Ok(packet)

src/packet/macros.rs

@@ -1,6 +1,6 @@
 #[macro_use]
-pub mod macros;
+mod macros;
 #[cfg(test)]
 #[allow(unused_variables)]
-pub mod test;
+mod test;