Merge pull request #1148 from ethcore/fixing-warnings
Fixing clippy warnings
This commit is contained in:
commit
94ec245187
@ -420,7 +420,7 @@ impl MinerService for Miner {
|
||||
|
||||
fn transaction(&self, hash: &H256) -> Option<SignedTransaction> {
|
||||
match (self.sealing_enabled.load(atomic::Ordering::Relaxed), self.sealing_work.lock().unwrap().peek_last_ref()) {
|
||||
(true, Some(pending)) => pending.transactions().iter().find(|t| &t.hash() == hash).map(|t| t.clone()),
|
||||
(true, Some(pending)) => pending.transactions().iter().find(|t| &t.hash() == hash).cloned(),
|
||||
_ => {
|
||||
let queue = self.transaction_queue.lock().unwrap();
|
||||
queue.find(hash)
|
||||
|
@ -75,6 +75,7 @@ impl Informant {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg_attr(feature="dev", allow(match_bool))]
|
||||
pub fn tick(&self, client: &Client, maybe_sync: Option<&EthSync>) {
|
||||
let elapsed = self.last_tick.read().unwrap().elapsed();
|
||||
if elapsed < Duration::from_secs(5) {
|
||||
|
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! kvdb::Database as migration::Destination
|
||||
//! `kvdb::Database` as `migration::Destination`
|
||||
|
||||
use std::collections::BTreeMap;
|
||||
use kvdb::{Database, DBTransaction};
|
||||
|
Loading…
Reference in New Issue
Block a user