Merge branch 'master' into jsonrpc2

2016-02-15 10:53:01 +01:00
parent 2748e770e4 d62d78a0fc
commit 4c474d8d91
31 changed files with 927 additions and 109 deletions
--- a/rpc/src/v1/types/block_number.rs
+++ b/rpc/src/v1/types/block_number.rs
@@ -55,6 +55,7 @@ impl Visitor for BlockNumberVisitor {
 }

 impl Into<BlockId> for BlockNumber {
+	#[allow(match_same_arms)]
 	fn into(self) -> BlockId {
 		match self {
 			BlockNumber::Num(n) => BlockId::Number(n),