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

rpc/Cargo.toml

@@ -15,6 +15,7 @@ futures-cpupool = "0.1"
 log = "0.3"
 multihash ="0.6"
 order-stat = "0.1"
+parking_lot = "0.4"
 rand = "0.3"
 rust-crypto = "0.2"
 rustc-hex = "1.0"

rpc/src/lib.rs

@@ -28,6 +28,7 @@ extern crate futures_cpupool;
 extern crate itertools;
 extern crate multihash;
 extern crate order_stat;
+extern crate parking_lot;
 extern crate rand;
 extern crate rustc_hex;
 extern crate semver;

rpc/src/v1/helpers/dispatch.rs

@@ -27,7 +27,8 @@ use light::on_demand::{request, OnDemand};
 use light::TransactionQueue as LightTransactionQueue;
 use rlp;
 use hash::keccak;
-use util::{Address, H520, H256, U256, Bytes, Mutex, RwLock};
+use util::{Address, H520, H256, U256, Bytes};
+use parking_lot::{Mutex, RwLock};
 use stats::Corpus;
 
 use ethkey::Signature;

rpc/src/v1/helpers/light_fetch.rs

@@ -37,7 +37,8 @@ use light::on_demand::{request, OnDemand, HeaderRef, Request as OnDemandRequest,
 use light::request::Field;
 
 use ethsync::LightSync;
-use util::{Address, Mutex, U256};
+use util::{Address, U256};
+use parking_lot::Mutex;
 
 use v1::helpers::{CallRequest as CallRequestHelper, errors, dispatch};
 use v1::types::{BlockNumber, CallRequest, Log};

rpc/src/v1/helpers/signer.rs

@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use std::ops::Deref;
 use http::Origin;
-use util::Mutex;
+use parking_lot::Mutex;
 use transient_hashmap::TransientHashMap;
 
 use ethstore::random_string;

rpc/src/v1/helpers/signing_queue.rs

@@ -19,7 +19,8 @@ use std::cell::RefCell;
 use std::sync::Arc;
 use std::collections::BTreeMap;
 use jsonrpc_core;
-use util::{Mutex, RwLock, U256, Address};
+use parking_lot::{Mutex, RwLock};
+use util::{U256, Address};
 use ethcore::account_provider::DappId;
 use v1::helpers::{ConfirmationRequest, ConfirmationPayload};
 use v1::types::{ConfirmationResponse, H160 as RpcH160, Origin, DappId as RpcDappId};
@@ -297,7 +298,8 @@ mod test {
 	use std::time::Duration;
 	use std::thread;
 	use std::sync::{mpsc, Arc};
-	use util::{Address, U256, Mutex};
+	use parking_lot::Mutex;
+	use util::{Address, U256};
 	use v1::helpers::{SigningQueue, ConfirmationsQueue, QueueEvent, FilledTransactionRequest, ConfirmationPayload};
 	use v1::types::ConfirmationResponse;
 

rpc/src/v1/helpers/subscription_manager.rs

@@ -18,7 +18,7 @@
 
 use std::sync::Arc;
 use std::sync::atomic::{self, AtomicBool};
-use util::Mutex;
+use parking_lot::Mutex;
 
 use jsonrpc_core::futures::future::{self, Either};
 use jsonrpc_core::futures::sync::mpsc;

rpc/src/v1/impls/eth.rs

@@ -24,7 +24,7 @@ use futures::{self, future, BoxFuture, Future};
 use rlp::{self, UntrustedRlp};
 use time::get_time;
 use util::{H160, H256, Address, U256, H64};
-use util::Mutex;
+use parking_lot::Mutex;
 
 use ethash::SeedHashCompute;
 use ethcore::account_provider::{AccountProvider, DappId};

rpc/src/v1/impls/eth_filter.rs

@@ -23,7 +23,8 @@ use jsonrpc_core::*;
 use ethcore::miner::MinerService;
 use ethcore::filter::Filter as EthcoreFilter;
 use ethcore::client::{BlockChainClient, BlockId};
-use util::{H256, Mutex};
+use util::H256;
+use parking_lot::Mutex;
 
 use futures::{future, Future, BoxFuture};
 

rpc/src/v1/impls/eth_pubsub.rs

@@ -39,7 +39,8 @@ use light::cache::Cache;
 use light::on_demand::OnDemand;
 use light::client::{LightChainClient, LightChainNotify};
 use parity_reactor::Remote;
-use util::{RwLock, Mutex, H256, Bytes};
+use util::{H256, Bytes};
+use parking_lot::{RwLock, Mutex};
 
 type Client = Sink<pubsub::Result>;
 

rpc/src/v1/impls/light/eth.rs

@@ -39,7 +39,8 @@ use ethcore::transaction::{Action, SignedTransaction, Transaction as EthTransact
 use ethsync::LightSync;
 use rlp::UntrustedRlp;
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
-use util::{RwLock, Mutex, U256};
+use util::U256;
+use parking_lot::{RwLock, Mutex};
 
 use futures::{future, Future, BoxFuture, IntoFuture};
 use futures::sync::oneshot;

rpc/src/v1/impls/pubsub.rs

@@ -18,7 +18,7 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use util::RwLock;
+use parking_lot::RwLock;
 
 use futures::{self, BoxFuture, Future, Stream, Sink};
 use jsonrpc_core::{self as core, Error, MetaIoHandler};

rpc/src/v1/impls/signer.rs

@@ -24,7 +24,7 @@ use ethkey;
 use futures::{future, BoxFuture, Future, IntoFuture};
 use parity_reactor::Remote;
 use rlp::UntrustedRlp;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use jsonrpc_core::{futures, Error};
 use jsonrpc_pubsub::SubscriptionId;

rpc/src/v1/impls/signing.rs

@@ -18,7 +18,8 @@
 
 use std::sync::Arc;
 use transient_hashmap::TransientHashMap;
-use util::{U256, Mutex};
+use parking_lot::Mutex;
+use util::U256;
 
 use ethcore::account_provider::AccountProvider;
 

rpc/src/v1/informant.rs

@@ -24,7 +24,7 @@ use futures::Future;
 use futures_cpupool as pool;
 use jsonrpc_core as rpc;
 use order_stat;
-use util::RwLock;
+use parking_lot::RwLock;
 
 pub use self::pool::CpuPool;
 

rpc/src/v1/tests/helpers/miner_service.rs

@@ -18,7 +18,8 @@
 
 use std::collections::{BTreeMap, HashMap};
 use std::collections::hash_map::Entry;
-use util::{Address, H256, Bytes, U256, RwLock, Mutex};
+use util::{Address, H256, Bytes, U256};
+use parking_lot::{RwLock, Mutex};
 use ethcore::error::Error;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::block::ClosedBlock;

rpc/src/v1/tests/helpers/snapshot_service.rs

@@ -16,7 +16,8 @@
 
 use ethcore::snapshot::{ManifestData, RestorationStatus, SnapshotService};
 
-use util::{Bytes, Mutex};
+use parking_lot::Mutex;
+use util::Bytes;
 use util::hash::H256;
 
 /// Mocked snapshot service (used for sync info extensions).

rpc/src/v1/tests/helpers/sync_provider.rs

@@ -17,7 +17,8 @@
 //! Test implementation of SyncProvider.
 
 use std::collections::BTreeMap;
-use util::{H256, RwLock};
+use parking_lot::RwLock;
+use util::H256;
 use ethsync::{SyncProvider, EthProtocolInfo, SyncStatus, SyncState, PeerInfo, TransactionStats};
 
 /// TestSyncProvider config.

rpc/src/v1/tests/mocked/eth.rs

@@ -22,7 +22,8 @@ use rustc_hex::{FromHex, ToHex};
 use time::get_time;
 use rlp;
 
-use util::{U256, Address, H256, Mutex};
+use util::{U256, Address, H256};
+use parking_lot::Mutex;
 use ethkey::Secret;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::{TestBlockChainClient, EachBlockWith, Executed, TransactionId};