diff --git a/accounts/ethstore/src/json/id.rs b/accounts/ethstore/src/json/id.rs index 27550428f..aa78ba96b 100644 --- a/accounts/ethstore/src/json/id.rs +++ b/accounts/ethstore/src/json/id.rs @@ -38,7 +38,7 @@ impl<'a> Into for &'a Uuid { let d3 = &self.0[6..8]; let d4 = &self.0[8..10]; let d5 = &self.0[10..16]; - [d1, d2, d3, d4, d5].into_iter().map(|d| d.to_hex()).collect::>().join("-") + [d1, d2, d3, d4, d5].iter().map(|d| d.to_hex()).collect::>().join("-") } } diff --git a/ethcore/builtin/src/lib.rs b/ethcore/builtin/src/lib.rs index d39f980d3..d01d07ff5 100644 --- a/ethcore/builtin/src/lib.rs +++ b/ethcore/builtin/src/lib.rs @@ -359,30 +359,39 @@ impl Implementation for EthereumBuiltin { } #[derive(Debug)] +/// The identity builtin pub struct Identity; #[derive(Debug)] +/// The EC Recover builtin pub struct EcRecover; #[derive(Debug)] +/// The Sha256 builtin pub struct Sha256; #[derive(Debug)] +/// The Ripemd160 builtin pub struct Ripemd160; #[derive(Debug)] +/// The Modexp builtin pub struct Modexp; #[derive(Debug)] +/// The Bn128Add builtin pub struct Bn128Add; #[derive(Debug)] +/// The Bn128Mul builtin pub struct Bn128Mul; #[derive(Debug)] +/// The Bn128Pairing builtin pub struct Bn128Pairing; #[derive(Debug)] +/// The Blake2F builtin pub struct Blake2F; impl Implementation for Identity { diff --git a/ethcore/machine/src/tx_filter.rs b/ethcore/machine/src/tx_filter.rs index 1a02a0071..de167bc9e 100644 --- a/ethcore/machine/src/tx_filter.rs +++ b/ethcore/machine/src/tx_filter.rs @@ -53,7 +53,7 @@ pub struct TransactionFilter { contract_address: Address, transition_block: BlockNumber, permission_cache: Mutex>, - contract_version_cache: Mutex>> + contract_version_cache: Mutex>> } impl TransactionFilter { diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index bdaaedebc..fd5ff1306 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -1207,7 +1207,7 @@ impl Client { gas: U256::from(50_000_000), gas_price: U256::default(), value: U256::default(), - data: data, + data, }.fake_sign(from) } diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs index a3f1836f1..9fb2b9dc5 100644 --- a/parity/rpc_apis.rs +++ b/parity/rpc_apis.rs @@ -708,7 +708,7 @@ impl ApiSet { Api::Rpc, Api::Private, ] - .into_iter() + .iter() .cloned() .collect(); @@ -750,7 +750,7 @@ impl ApiSet { Api::Traces, Api::ParityTransactionsPool, ] - .into_iter() + .iter() .cloned() .collect(), } diff --git a/util/EIP-712/src/encode.rs b/util/EIP-712/src/encode.rs index c91b781b7..e392c5c1b 100644 --- a/util/EIP-712/src/encode.rs +++ b/util/EIP-712/src/encode.rs @@ -41,7 +41,7 @@ fn check_hex(string: &str) -> Result<()> { } /// given a type and HashMap> /// returns a HashSet of dependent types of the given type -fn build_dependencies<'a>(message_type: &'a str, message_types: &'a MessageTypes) -> Option<(HashSet<&'a str>)> +fn build_dependencies<'a>(message_type: &'a str, message_types: &'a MessageTypes) -> Option> { if message_types.get(message_type).is_none() { return None;