Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Merge pull request #1148 from ethcore/fixing-warnings
Browse files Browse the repository at this point in the history
Fixing clippy warnings
  • Loading branch information
debris committed May 26, 2016
2 parents 32298ca + 5b0c936 commit 94ec245
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion miner/src/miner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions parity/informant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion util/src/migration/db_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down

0 comments on commit 94ec245

Please sign in to comment.