Merge pull request #1354 from ethcore/warnings-fix

Fixing clippy warnings

ethcore/src/account_provider.rs

@@ -236,7 +236,6 @@ impl AccountProvider {
 #[cfg(test)]
 mod tests {
 	use super::AccountProvider;
-	use ethstore::SecretStore;
 	use ethstore::ethkey::{Generator, Random};
 
 	#[test]

parity/configuration.rs

@@ -292,9 +292,10 @@ impl Configuration {
 		}).collect::<Vec<_>>();
 
 		if !self.args.flag_no_import_keys {
-			let dir_type = match self.args.flag_testnet {
-				true => DirectoryType::Testnet,
-				false => DirectoryType::Main,
+			let dir_type = if self.args.flag_testnet {
+				DirectoryType::Testnet
+			} else {
+				DirectoryType::Main
 			};
 
 			let from = GethDirectory::open(dir_type);

parity/io_handler.rs

@@ -39,9 +39,8 @@ impl IoHandler<NetSyncMessage> for ClientIoHandler {
 	}
 
 	fn timeout(&self, _io: &IoContext<NetSyncMessage>, timer: TimerToken) {
-		match timer {
-			INFO_TIMER => { self.info.tick(&self.client, Some(&self.sync)); }
-			_ => {}
+		if let INFO_TIMER = timer {
+			self.info.tick(&self.client, Some(&self.sync));
 		}
 	}
 

parity/main.rs

@@ -487,7 +487,7 @@ fn execute_signer(conf: Configuration) {
 }
 
 fn execute_account_cli(conf: Configuration) {
-	use ethcore::ethstore::{SecretStore, EthStore, import_accounts};
+	use ethcore::ethstore::{EthStore, import_accounts};
 	use ethcore::ethstore::dir::DiskDirectory;
 	use ethcore::account_provider::AccountProvider;
 	use rpassword::read_password;

util/src/network/host.rs

@@ -684,14 +684,11 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 				match s.readable(io, &self.info.read().unwrap()) {
 					Err(e) => {
 						trace!(target: "network", "Session read error: {}:{:?} ({:?}) {:?}", token, s.id(), s.remote_addr(), e);
-						match e {
-							UtilError::Network(NetworkError::Disconnect(DisconnectReason::IncompatibleProtocol)) => {
+						if let UtilError::Network(NetworkError::Disconnect(DisconnectReason::IncompatibleProtocol)) = e {
 							if let Some(id) = s.id() {
 								self.nodes.write().unwrap().mark_as_useless(id);
 							}
 						}
-							_ => (),
-						}
 						kill = true;
 						break;
 					},