Merge remote-tracking branch 'parity/master' into bft

Conflicts:
	ethcore/src/client/client.rs

json/Cargo.toml

@@ -7,13 +7,13 @@ build = "build.rs"
 [dependencies]
 ethcore-util = { path = "../util" }
 rustc-serialize = "0.3"
-serde = "0.7.0"
-serde_json = "0.7.0"
-serde_macros = { version = "0.7.0", optional = true }
+serde = "0.8"
+serde_json = "0.8"
+serde_macros = { version = "0.8", optional = true }
 clippy = { version = "0.0.85", optional = true}
 
 [build-dependencies]
-serde_codegen = { version = "0.7.0", optional = true }
+serde_codegen = { version = "0.8", optional = true }
 
 [features]
 default = ["serde_codegen"]

json/src/blockchain/blockchain.rs

@@ -178,5 +178,5 @@ mod tests {
 		}"#;
 		let _deserialized: BlockChain = serde_json::from_str(s).unwrap();
 		// TODO: validate all fields
-	//}
+	}
 }

json/src/bytes.rs

@@ -56,7 +56,7 @@ impl FromStr for Bytes {
 			2 if value.starts_with("0x") => vec![],
 			_ if value.starts_with("0x") && value.len() % 2 == 1 => {
 				let v = "0".to_owned() + &value[2..];
-				FromHex::from_hex(v.as_ref() as &str).unwrap_or(vec![]),
+				FromHex::from_hex(v.as_str()).unwrap_or(vec![])
 			},
 			_ if value.starts_with("0x") => FromHex::from_hex(&value[2..]).unwrap_or(vec![]),
 			_ => FromHex::from_hex(value).unwrap_or(vec![]),

json/src/vm/call.rs

@@ -39,9 +39,8 @@ pub struct Call {
 mod tests {
 	use serde_json;
 	use vm::Call;
-	use util::U256;
+	use util::{U256, H160 as Hash160};
 	use uint::Uint;
-	use util::hash::Address as Hash160;
 	use hash::Address;
 	use maybe::MaybeEmpty;
 	use std::str::FromStr;