Merge branch 'master' into rustfmt

Conflicts:
	ethash/src/sizes.rs
	util/src/uint.rs

util/src/rlp/bytes.rs

@@ -21,7 +21,7 @@ use std::mem;
 use std::fmt;
 use std::cmp::Ordering;
 use std::error::Error as StdError;
-use uint::{Uint, U128, U256};
+use bigint::uint::{Uint, U128, U256};
 use hash::FixedHash;
 use elastic_array::*;
 
@@ -232,12 +232,12 @@ impl_uint_from_bytes!(u64);
 impl_uint_from_bytes!(usize);
 
 macro_rules! impl_uint_from_bytes {
-	($name: ident) => {
+	($name: ident, $size: expr) => {
 		impl FromBytes for $name {
 			fn from_bytes(bytes: &[u8]) -> FromBytesResult<$name> {
 				if !bytes.is_empty() && bytes[0] == 0 {
 					Err(FromBytesError::ZeroPrefixedInt)
-				} else if bytes.len() <= $name::SIZE {
+				} else if bytes.len() <= $size {
 					Ok($name::from(bytes))
 				} else {
 					Err(FromBytesError::DataIsTooLong)
@@ -247,8 +247,8 @@ macro_rules! impl_uint_from_bytes {
 	}
 }
 
-impl_uint_from_bytes!(U256);
-impl_uint_from_bytes!(U128);
+impl_uint_from_bytes!(U256, 32);
+impl_uint_from_bytes!(U128, 16);
 
 impl <T>FromBytes for T where T: FixedHash {
 	fn from_bytes(bytes: &[u8]) -> FromBytesResult<T> {

util/src/rlp/rlpin.rs

@@ -116,7 +116,7 @@ impl<'a, 'view> View<'a, 'view> for Rlp<'a> where 'a: 'view {
 impl <'a, 'view> Rlp<'a> where 'a: 'view {
 	fn view_as_val<T, R>(r: &R) -> T where R: View<'a, 'view>, T: RlpDecodable {
 		let res: Result<T, DecoderError> = r.as_val();
-		res.unwrap_or_else(|_| panic!())
+		res.unwrap_or_else(|e| panic!("DecodeError: {}", e))
 	}
 
 	/// Decode into an object

util/src/rlp/rlpstream.rs

@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::ops::Deref;
+use std::default::Default;
 use elastic_array::*;
 use rlp::bytes::{ToBytes, VecLike};
 use rlp::{Stream, Encoder, Encodable};
@@ -44,6 +45,12 @@ pub struct RlpStream {
 	finished_list: bool,
 }
 
+impl Default  for RlpStream {
+	fn default() -> Self {
+		RlpStream::new()
+	}
+}
+
 impl Stream for RlpStream {
 	fn new() -> Self {
 		RlpStream {
@@ -190,8 +197,14 @@ struct BasicEncoder {
 	bytes: ElasticArray1024<u8>,
 }
 
+impl Default for BasicEncoder {
+	fn default() -> Self {
+		BasicEncoder::new()
+	}
+}
+
 impl BasicEncoder {
-	fn new() -> BasicEncoder {
+	fn new() -> Self {
 		BasicEncoder { bytes: ElasticArray1024::new() }
 	}
 
@@ -222,7 +235,7 @@ impl Encoder for BasicEncoder {
 			// just 0
 			0 => self.bytes.push(0x80u8),
 			// byte is its own encoding if < 0x80
-			1 => { 
+			1 => {
 				value.to_bytes(&mut self.bytes);
 				let len = self.bytes.len();
 				let last_byte = self.bytes[len - 1];

util/src/rlp/tests.rs

@@ -21,7 +21,7 @@ use std::{fmt, cmp};
 use std::str::FromStr;
 use rlp;
 use rlp::{UntrustedRlp, RlpStream, View, Stream, DecoderError};
-use uint::U256;
+use bigint::uint::U256;
 
 #[test]
 fn rlp_at() {

util/src/rlp/untrusted_rlp.rs

@@ -429,7 +429,6 @@ impl<T> Decodable for Option<T> where T: Decodable {
 macro_rules! impl_array_decodable {
 	($index_type:ty, $len:expr ) => (
 		impl<T> Decodable for [T; $len] where T: Decodable {
-			#[allow(len_zero)]
 			fn decode<D>(decoder: &D) -> Result<Self, DecoderError>  where D: Decoder {
 				let decoders = decoder.as_rlp();