migrated rpc to serde 1.0

rpc/src/v1/types/block_number.rs

@@ -38,9 +38,9 @@ impl Default for BlockNumber {
 	}
 }
 
-impl Deserialize for BlockNumber {
-	fn deserialize<D>(deserializer: D) -> Result<BlockNumber, D::Error> where D: Deserializer {
-		deserializer.deserialize(BlockNumberVisitor)
+impl<'a> Deserialize<'a> for BlockNumber {
+	fn deserialize<D>(deserializer: D) -> Result<BlockNumber, D::Error> where D: Deserializer<'a> {
+		deserializer.deserialize_any(BlockNumberVisitor)
 	}
 }
 
@@ -67,7 +67,7 @@ impl Serialize for BlockNumber {
 
 struct BlockNumberVisitor;
 
-impl Visitor for BlockNumberVisitor {
+impl<'a> Visitor<'a> for BlockNumberVisitor {
 	type Value = BlockNumber;
 
 	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

rpc/src/v1/types/bytes.rs

@@ -57,16 +57,16 @@ impl Serialize for Bytes {
 	}
 }
 
-impl Deserialize for Bytes {
+impl<'a> Deserialize<'a> for Bytes {
 	fn deserialize<D>(deserializer: D) -> Result<Bytes, D::Error>
-	where D: Deserializer {
-		deserializer.deserialize(BytesVisitor)
+	where D: Deserializer<'a> {
+		deserializer.deserialize_any(BytesVisitor)
 	}
 }
 
 struct BytesVisitor;
 
-impl Visitor for BytesVisitor {
+impl<'a> Visitor<'a> for BytesVisitor {
 	type Value = Bytes;
 
 	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

rpc/src/v1/types/derivation.rs

@@ -102,15 +102,15 @@ impl Derive {
 	}
 }
 
-impl Deserialize for DerivationType {
-	fn deserialize<D>(deserializer: D) -> Result<DerivationType, D::Error> where D: Deserializer {
-		deserializer.deserialize(DerivationTypeVisitor)
+impl<'a> Deserialize<'a> for DerivationType {
+	fn deserialize<D>(deserializer: D) -> Result<DerivationType, D::Error> where D: Deserializer<'a> {
+		deserializer.deserialize_any(DerivationTypeVisitor)
 	}
 }
 
 struct DerivationTypeVisitor;
 
-impl Visitor for DerivationTypeVisitor {
+impl<'a> Visitor<'a> for DerivationTypeVisitor {
 	type Value = DerivationType;
 
 	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

rpc/src/v1/types/filter.rs

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde::de::Error;
+use serde::de::{Error, DeserializeOwned};
 use serde_json::{Value, from_value};
 use ethcore::filter::Filter as EthFilter;
 use ethcore::client::BlockId;
@@ -23,7 +23,7 @@ use v1::types::{BlockNumber, H160, H256, Log};
 
 /// Variadic value
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
-pub enum VariadicValue<T> where T: Deserialize {
+pub enum VariadicValue<T> where T: DeserializeOwned {
 	/// Single
 	Single(T),
 	/// List
@@ -32,9 +32,9 @@ pub enum VariadicValue<T> where T: Deserialize {
 	Null,
 }
 
-impl<T> Deserialize for VariadicValue<T> where T: Deserialize {
+impl<'a, T> Deserialize<'a> for VariadicValue<T> where T: DeserializeOwned {
 	fn deserialize<D>(deserializer: D) -> Result<VariadicValue<T>, D::Error>
-	where D: Deserializer {
+	where D: Deserializer<'a> {
 		let v: Value = Deserialize::deserialize(deserializer)?;
 
 		if v.is_null() {

rpc/src/v1/types/hash.rs

@@ -116,11 +116,11 @@ macro_rules! impl_hash {
 			}
 		}
 
-		impl serde::Deserialize for $name {
-			fn deserialize<D>(deserializer: D) -> Result<$name, D::Error> where D: serde::Deserializer {
+		impl<'a> serde::Deserialize<'a> for $name {
+			fn deserialize<D>(deserializer: D) -> Result<$name, D::Error> where D: serde::Deserializer<'a> {
 				struct HashVisitor;
 
-				impl serde::de::Visitor for HashVisitor {
+				impl<'b> serde::de::Visitor<'b> for HashVisitor {
 					type Value = $name;
 
 					fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -151,7 +151,7 @@ macro_rules! impl_hash {
 					}
 				}
 
-				deserializer.deserialize(HashVisitor)
+				deserializer.deserialize_any(HashVisitor)
 			}
 		}
 	}

rpc/src/v1/types/index.rs

@@ -29,16 +29,16 @@ impl Index {
 	}
 }
 
-impl Deserialize for Index {
+impl<'a> Deserialize<'a> for Index {
 	fn deserialize<D>(deserializer: D) -> Result<Index, D::Error>
-	where D: Deserializer {
-		deserializer.deserialize(IndexVisitor)
+	where D: Deserializer<'a> {
+		deserializer.deserialize_any(IndexVisitor)
 	}
 }
 
 struct IndexVisitor;
 
-impl Visitor for IndexVisitor {
+impl<'a> Visitor<'a> for IndexVisitor {
 	type Value = Index;
 
 	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

rpc/src/v1/types/pubsub.rs

@@ -74,9 +74,9 @@ impl Default for Params {
 	}
 }
 
-impl Deserialize for Params {
+impl<'a> Deserialize<'a> for Params {
 	fn deserialize<D>(deserializer: D) -> ::std::result::Result<Params, D::Error>
-	where D: Deserializer {
+	where D: Deserializer<'a> {
 		let v: Value = Deserialize::deserialize(deserializer)?;
 
 		if v.is_null() {

rpc/src/v1/types/uint.rs

@@ -65,12 +65,12 @@ macro_rules! impl_uint {
 			}
 		}
 
-		impl serde::Deserialize for $name {
+		impl<'a> serde::Deserialize<'a> for $name {
 			fn deserialize<D>(deserializer: D) -> Result<$name, D::Error>
-			where D: serde::Deserializer {
+			where D: serde::Deserializer<'a> {
 				struct UintVisitor;
 
-				impl serde::de::Visitor for UintVisitor {
+				impl<'b> serde::de::Visitor<'b> for UintVisitor {
 					type Value = $name;
 
 					fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -95,7 +95,7 @@ macro_rules! impl_uint {
 					}
 				}
 
-				deserializer.deserialize(UintVisitor)
+				deserializer.deserialize_any(UintVisitor)
 			}
 		}