dependencies: bump derive_more v0.99

ethcore/account-state/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 common-types = { path = "../types"}
-derive_more = "0.15.0"
+derive_more = "0.99"
 ethereum-types = "0.8.0"
 ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
 trie-vm-factories = { path = "../trie-vm-factories" }

ethcore/engines/authority-round/Cargo.toml

@@ -11,7 +11,7 @@ block-gas-limit = { path = "../../block-gas-limit" }
 block-reward = { path = "../../block-reward" }
 client-traits = { path = "../../client-traits" }
 common-types = { path = "../../types" }
-derive_more = "0.15.0"
+derive_more = "0.99"
 ethabi = "9.0.1"
 ethabi-contract = "9.0.0"
 ethabi-derive = "9.0.1"

ethcore/light/Cargo.toml

@@ -11,7 +11,7 @@ log = "0.4"
 parity-bytes = "0.1"
 client-traits = { path = "../client-traits" }
 common-types = { path = "../types" }
-derive_more = "0.14.0"
+derive_more = "0.99"
 engine = { path = "../engine" }
 ethcore-db = { path = "../db" }
 ethcore-blockchain = { path = "../blockchain" }

ethcore/private-tx/Cargo.toml

@@ -9,7 +9,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 account-state = { path = "../account-state" }
 client-traits = { path = "../client-traits" }
 common-types = { path = "../types" }
-derive_more = "0.14.0"
+derive_more = "0.99"
 ethabi = "9.0.1"
 ethabi-contract = "9.0.0"
 ethabi-derive = "9.0.1"

ethcore/types/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-derive_more = "0.15.0"
+derive_more = "0.99"
 ethbloom = "0.8.0"
 ethcore-io = { path = "../../util/io" }
 ethereum-types = "0.8.0"

ethcore/types/src/errors/engine_error.rs

@@ -16,12 +16,11 @@
 
 use std::fmt;
 
-use derive_more::From;
 use ethereum_types::{Address, H64, H256};
 use unexpected::{Mismatch, OutOfBounds};
 
 /// Voting errors.
-#[derive(Debug, From)]
+#[derive(Debug)]
 pub enum EngineError {
 	/// Signature or author field does not belong to an authority.
 	NotAuthorized(Address),
@@ -78,11 +77,11 @@ impl fmt::Display for EngineError {
 		use self::EngineError::*;
 		let msg = match *self {
 			CliqueMissingCheckpoint(ref hash) => format!("Missing checkpoint block: {}", hash),
-			CliqueMissingVanity => format!("Extra data is missing vanity data"),
-			CliqueMissingSignature => format!("Extra data is missing signature"),
+			CliqueMissingVanity => "Extra data is missing vanity data".into(),
+			CliqueMissingSignature => "Extra data is missing signature".into(),
 			CliqueCheckpointInvalidSigners(len) => format!("Checkpoint block list was of length: {} of checkpoint but
 															it needs to be bigger than zero and a divisible by 20", len),
-			CliqueCheckpointNoSigner => format!("Checkpoint block list of signers was empty"),
+			CliqueCheckpointNoSigner => "Checkpoint block list of signers was empty".into(),
 			CliqueInvalidNonce(ref mis) => format!("Unexpected nonce {} expected {} or {}", mis, 0_u64, u64::max_value()),
 			CliqueWrongAuthorCheckpoint(ref oob) => format!("Unexpected checkpoint author: {}", oob),
 			CliqueFaultyRecoveredSigners(ref mis) => format!("Faulty recovered signers {:?}", mis),
@@ -98,9 +97,9 @@ impl fmt::Display for EngineError {
 			SystemCallResultDecoding(ref msg) => format!("Failed to decode the result of a system call: {}", msg),
 			SystemCallResultInvalid(ref msg) => format!("The result of a system call is invalid: {}", msg),
 			MalformedMessage(ref msg) => format!("Received malformed consensus message: {}", msg),
-			RequiresClient => format!("Call requires client but none registered"),
-			RequiresSigner => format!("Call requires signer but none registered"),
-			InvalidEngine => format!("Invalid engine specification or implementation"),
+			RequiresClient => "Call requires client but none registered".into(),
+			RequiresSigner => "Call requires signer but none registered".into(),
+			InvalidEngine => "Invalid engine specification or implementation".into(),
 			MissingParent(ref hash) => format!("Parent Epoch is missing from database: {}", hash),
 		};
 

util/network/Cargo.toml

@@ -7,7 +7,7 @@ version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-derive_more = "0.14.0"
+derive_more = "0.99"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 ethcore-io = { path = "../io" }
 ethereum-types = "0.8.0"