Merge branch 'dep-update'

Author: dylanmckay

Cargo.toml

@@ -14,9 +14,9 @@ keywords = ["protocol", "tcp", "udp", "connection", "encoding"]
 default = []
 
 [dependencies]
-byteorder = "0.5"
+byteorder = "1.0"
 flate2 = { version = "0.2", features = ["zlib"], default-features = false }
-uuid = { version = "0.3", optional = true }
+uuid = { version = "0.5", optional = true }
 
 [dev-dependencies]
 stainless = "0.1"

src/lib.rs

@@ -1,7 +1,6 @@
-#![feature(question_mark)]
 #![feature(try_from)]
-#![feature(plugin)]
 
+#![cfg_attr(test, feature(plugin))]
 #![cfg_attr(test, plugin(stainless))]
 
 //! Simple packet-based protocol definitions in Rust.

src/primitives/numerics.rs

@@ -6,16 +6,16 @@ use std::num::TryFromIntError;
 
 use byteorder::{ReadBytesExt, WriteBytesExt};
 
-pub trait Integer : Parcel + TryFrom<u8, Err=TryFromIntError> + TryFrom<i8, Err=TryFromIntError> +
-                    TryFrom<u16, Err=TryFromIntError> + TryFrom<i16, Err=TryFromIntError> +
-                    TryFrom<u32, Err=TryFromIntError> + TryFrom<i32, Err=TryFromIntError> +
-                    TryFrom<u64, Err=TryFromIntError> + TryFrom<i64, Err=TryFromIntError> +
-                    TryFrom<usize, Err=TryFromIntError> + TryFrom<isize, Err=TryFromIntError> +
-                    TryInto<u8, Err=TryFromIntError> + TryInto<i8, Err=TryFromIntError> +
-                    TryInto<u16, Err=TryFromIntError> + TryInto<i16, Err=TryFromIntError> +
-                    TryInto<u32, Err=TryFromIntError> + TryInto<i32, Err=TryFromIntError> +
-                    TryInto<u64, Err=TryFromIntError> + TryInto<i64, Err=TryFromIntError> +
-                    TryInto<usize, Err=TryFromIntError> + TryInto<isize, Err=TryFromIntError>
+pub trait Integer : Parcel + TryFrom<u8, Error=TryFromIntError> + TryFrom<i8, Error=TryFromIntError> +
+                    TryFrom<u16, Error=TryFromIntError> + TryFrom<i16, Error=TryFromIntError> +
+                    TryFrom<u32, Error=TryFromIntError> + TryFrom<i32, Error=TryFromIntError> +
+                    TryFrom<u64, Error=TryFromIntError> + TryFrom<i64, Error=TryFromIntError> +
+                    TryFrom<usize, Error=TryFromIntError> + TryFrom<isize, Error=TryFromIntError> +
+                    TryInto<u8, Error=TryFromIntError> + TryInto<i8, Error=TryFromIntError> +
+                    TryInto<u16, Error=TryFromIntError> + TryInto<i16, Error=TryFromIntError> +
+                    TryInto<u32, Error=TryFromIntError> + TryInto<i32, Error=TryFromIntError> +
+                    TryInto<u64, Error=TryFromIntError> + TryInto<i64, Error=TryFromIntError> +
+                    TryInto<usize, Error=TryFromIntError> + TryInto<isize, Error=TryFromIntError>
 {
 
 }

src/wire/middleware/pipeline.rs

@@ -5,8 +5,8 @@ use std;
 /// A middleware pipeline.
 pub trait Pipeline : std::fmt::Debug
 {
-    fn encode_data(&mut self, mut data: Vec<u8>) -> Result<Vec<u8>, Error>;
-    fn decode_data(&mut self, mut data: Vec<u8>) -> Result<Vec<u8>, Error>;
+    fn encode_data(&mut self, data: Vec<u8>) -> Result<Vec<u8>, Error>;
+    fn decode_data(&mut self, data: Vec<u8>) -> Result<Vec<u8>, Error>;
 }
 
 /// Creates an instance of the default middleware.