remove re-export of parking_lot in util (#6435)

This commit is contained in:
Hawstein
2017-09-03 02:09:13 +08:00
committed by Gav Wood
parent 1d95fe481f
commit 7b8af30590
99 changed files with 161 additions and 75 deletions

View File

@@ -23,7 +23,7 @@ use engines::{Engine, EpochVerifier};
use header::Header;
use rand::Rng;
use util::RwLock;
use parking_lot::RwLock;
// do "heavy" verification on ~1/50 blocks, randomly sampled.
const HEAVY_VERIFY_RATE: f32 = 0.02;

View File

@@ -25,7 +25,7 @@ use itertools::Itertools;
// util
use hash::keccak;
use timer::PerfTimer;
use util::{Bytes, Mutex, RwLock, MutexGuard};
use util::Bytes;
use util::{journaldb, DBValue, TrieFactory, Trie};
use util::{U256, H256, Address, H2048};
use util::trie::TrieSpec;
@@ -56,6 +56,7 @@ use io::*;
use log_entry::LocalizedLogEntry;
use miner::{Miner, MinerService, TransactionImportResult};
use native_contracts::Registry;
use parking_lot::{Mutex, RwLock, MutexGuard};
use rand::OsRng;
use receipt::{Receipt, LocalizedReceipt};
use rlp::UntrustedRlp;

View File

@@ -23,6 +23,7 @@ use std::mem;
use itertools::Itertools;
use rustc_hex::FromHex;
use hash::keccak;
use parking_lot::RwLock;
use util::*;
use rlp::*;
use ethkey::{Generator, Random};