Fixing some clippy warnings

ethcore/src/miner/miner.rs

@@ -151,7 +151,7 @@ impl GasPriceCalibrator {
 		if Instant::now() >= self.next_calibration {
 			let usd_per_tx = self.options.usd_per_tx;
 			trace!(target: "miner", "Getting price info");
-			if let Ok(_) = PriceInfo::get(move |price: PriceInfo| {
+			let price_info = PriceInfo::get(move |price: PriceInfo| {
 				trace!(target: "miner", "Price info arrived: {:?}", price);
 				let usd_per_eth = price.ethusd;
 				let wei_per_usd: f32 = 1.0e18 / usd_per_eth;
@@ -159,7 +159,9 @@ impl GasPriceCalibrator {
 				let wei_per_gas: f32 = wei_per_usd * usd_per_tx / gas_per_tx;
 				info!(target: "miner", "Updated conversion rate to Ξ1 = {} ({} wei/gas)", Colour::White.bold().paint(format!("US${}", usd_per_eth)), Colour::Yellow.bold().paint(format!("{}", wei_per_gas)));
 				set_price(U256::from(wei_per_gas as u64));
-			}) {
+			});
+
+			if price_info.is_ok() {
 				self.next_calibration = Instant::now() + self.options.recalibration_period;
 			} else {
 				warn!(target: "miner", "Unable to update Ether price.");
@@ -1142,12 +1144,10 @@ mod tests {
 	use std::time::Duration;
 	use super::super::{MinerService, PrioritizationStrategy};
 	use super::*;
-	use util::*;
 	use ethkey::{Generator, Random};
 	use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult};
 	use header::BlockNumber;
 	use types::transaction::{Transaction, SignedTransaction, Action};
-	use block::*;
 	use spec::Spec;
 	use tests::helpers::{generate_dummy_client};
 

ethcore/src/miner/transaction_queue.rs

@@ -990,7 +990,7 @@ impl TransactionQueue {
 		let mut update_last_nonce_to = None;
 		{
 			let by_nonce = self.future.by_address.row_mut(&address);
-			if let None = by_nonce {
+			if by_nonce.is_none() {
 				return;
 			}
 			let mut by_nonce = by_nonce.expect("None is tested in early-exit condition above; qed");
@@ -1212,7 +1212,6 @@ mod test {
 	use util::table::*;
 	use util::*;
 	use ethkey::{Random, Generator};
-	use transaction::*;
 	use error::{Error, TransactionError};
 	use super::*;
 	use super::{TransactionSet, TransactionOrder, VerifiedTransaction};