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

sync/src/chain.rs

@@ -93,6 +93,7 @@ use std::collections::{HashSet, HashMap};
 use std::cmp;
 use hash::keccak;
 use heapsize::HeapSizeOf;
+use parking_lot::RwLock;
 use util::*;
 use rlp::*;
 use network::*;
@@ -2230,7 +2231,8 @@ mod tests {
 	use network::PeerId;
 	use tests::helpers::*;
 	use tests::snapshot::TestSnapshotService;
-	use util::{U256, Address, RwLock};
+	use parking_lot::RwLock;
+	use util::{U256, Address};
 	use util::hash::H256;
 	use util::bytes::Bytes;
 	use rlp::{Rlp, RlpStream, UntrustedRlp};

sync/src/light_sync/mod.rs

@@ -45,7 +45,8 @@ use light::net::{
 };
 use light::request::{self, CompleteHeadersRequest as HeadersRequest};
 use network::PeerId;
-use util::{U256, H256, Mutex, RwLock};
+use util::{U256, H256};
+use parking_lot::{Mutex, RwLock};
 use rand::{Rng, OsRng};
 
 use self::sync_round::{AbortReason, SyncRound, ResponseContext};

sync/src/light_sync/tests/test_net.rs

@@ -29,7 +29,7 @@ use light::client::Client as LightClient;
 use light::net::{LightProtocol, IoContext, Capabilities, Params as LightParams};
 use light::provider::LightProvider;
 use network::{NodeId, PeerId};
-use util::RwLock;
+use parking_lot::RwLock;
 
 use time::Duration;
 use light::cache::Cache;

sync/src/tests/helpers.rs

@@ -16,6 +16,7 @@
 
 use std::collections::{VecDeque, HashSet, HashMap};
 use std::sync::Arc;
+use parking_lot::RwLock;
 use util::*;
 use network::*;
 use tests::snapshot::*;

sync/src/tests/snapshot.rs

@@ -17,6 +17,7 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 use hash::keccak;
+use parking_lot::Mutex;
 use util::*;
 use ethcore::snapshot::{SnapshotService, ManifestData, RestorationStatus};
 use ethcore::header::BlockNumber;