Merge pull request #1354 from ethcore/warnings-fix

Fixing clippy warnings
This commit is contained in:
Arkadiy Paronyan
2016-06-20 21:21:51 +02:00
committed by GitHub
5 changed files with 10 additions and 14 deletions

View File

@@ -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);

View File

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

View File

@@ -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;