updated serde to version 1.0

rpc/Cargo.toml

@@ -15,11 +15,11 @@ multihash ="0.6"
 order-stat = "0.1"
 rand = "0.3"
 rust-crypto = "0.2"
-rustc-serialize = "0.3"
+rustc-hex = "1.0"
 semver = "0.6"
-serde = "0.9"
-serde_derive = "0.9"
-serde_json = "0.9"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
 time = "0.1"
 tokio-timer = "0.1"
 transient-hashmap = "0.4"

rpc/src/lib.rs

@@ -26,7 +26,7 @@ extern crate futures;
 extern crate multihash;
 extern crate order_stat;
 extern crate rand;
-extern crate rustc_serialize;
+extern crate rustc_hex;
 extern crate semver;
 extern crate serde;
 extern crate serde_json;

rpc/src/v1/helpers/secretstore.rs

@@ -99,7 +99,7 @@ fn decrypt_with_shadow_coefficients(mut decrypted_shadow: Public, mut common_sha
 #[cfg(test)]
 mod tests {
 	use util::Bytes;
-	use rustc_serialize::hex::FromHex;
+	use rustc_hex::FromHex;
 	use super::{encrypt_document, decrypt_document, decrypt_document_with_shadow};
 
 	#[test]

rpc/src/v1/tests/mocked/eth.rs

@@ -18,7 +18,7 @@ use std::str::FromStr;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::{Instant, Duration};
-use rustc_serialize::hex::{FromHex, ToHex};
+use rustc_hex::{FromHex, ToHex};
 use time::get_time;
 use rlp;
 
@@ -536,7 +536,7 @@ fn rpc_eth_transaction_count_by_number_pending() {
 
 #[test]
 fn rpc_eth_pending_transaction_by_hash() {
-	use util::{H256, FromHex};
+	use util::H256;
 	use rlp;
 	use ethcore::transaction::SignedTransaction;
 

rpc/src/v1/tests/mocked/parity_set.rs

@@ -16,7 +16,7 @@
 
 use std::sync::Arc;
 use std::str::FromStr;
-use rustc_serialize::hex::FromHex;
+use rustc_hex::FromHex;
 use util::{U256, Address};
 
 use ethcore::miner::MinerService;

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

@@ -17,10 +17,9 @@
 //! Serializable wrapper around vector of bytes
 
 use std::fmt;
-use rustc_serialize::hex::ToHex;
+use rustc_hex::{ToHex, FromHex};
 use serde::{Serialize, Serializer, Deserialize, Deserializer};
 use serde::de::{Error, Visitor};
-use util::common::FromHex;
 
 /// Wrapper structure around vector of bytes.
 #[derive(Debug, PartialEq, Eq, Default, Hash, Clone)]
@@ -58,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 {
@@ -98,7 +97,7 @@ impl Visitor for BytesVisitor {
 mod tests {
 	use super::*;
 	use serde_json;
-	use rustc_serialize::hex::FromHex;
+	use rustc_hex::FromHex;
 
 	#[test]
 	fn test_bytes_serialize() {

rpc/src/v1/types/call_request.rs

@@ -55,7 +55,7 @@ impl Into<Request> for CallRequest {
 #[cfg(test)]
 mod tests {
 	use std::str::FromStr;
-	use rustc_serialize::hex::FromHex;
+	use rustc_hex::FromHex;
 	use serde_json;
 	use v1::types::{U256, H160};
 	use super::CallRequest;

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

@@ -19,7 +19,7 @@ use std::str::FromStr;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
 use serde;
-use rustc_serialize::hex::{ToHex, FromHex};
+use rustc_hex::{ToHex, FromHex};
 use util::{H64 as Eth64, H160 as Eth160, H256 as Eth256, H520 as Eth520, H512 as Eth512, H2048 as Eth2048};
 
 macro_rules! impl_hash {
@@ -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/transaction_request.rs

@@ -131,7 +131,7 @@ impl Into<helpers::TransactionRequest> for TransactionRequest {
 #[cfg(test)]
 mod tests {
 	use std::str::FromStr;
-	use rustc_serialize::hex::FromHex;
+	use rustc_hex::FromHex;
 	use serde_json;
 	use v1::types::{U256, H160, TransactionCondition};
 	use super::*;

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)
 			}
 		}