Merge branch 'master' into fo-6418-dont-export-bigint

# Conflicts:
#	dapps/src/tests/helpers/registrar.rs
#	ethcore/evm/src/interpreter/shared_cache.rs
#	ethcore/light/src/client/header_chain.rs
#	ethcore/light/src/client/mod.rs
#	ethcore/light/src/net/mod.rs
#	ethcore/light/src/on_demand/request.rs
#	ethcore/light/src/on_demand/tests.rs
#	ethcore/light/src/provider.rs
#	ethcore/node_filter/src/lib.rs
#	ethcore/src/block.rs
#	ethcore/src/blockchain/blockchain.rs
#	ethcore/src/client/test_client.rs
#	ethcore/src/engines/authority_round/mod.rs
#	ethcore/src/engines/basic_authority.rs
#	ethcore/src/engines/mod.rs
#	ethcore/src/engines/tendermint/mod.rs
#	ethcore/src/engines/validator_set/contract.rs
#	ethcore/src/engines/validator_set/multi.rs
#	ethcore/src/engines/validator_set/safe_contract.rs
#	ethcore/src/engines/vote_collector.rs
#	ethcore/src/miner/external.rs
#	ethcore/src/miner/miner.rs
#	ethcore/src/miner/service_transaction_checker.rs
#	ethcore/src/miner/work_notify.rs
#	ethcore/src/pod_account.rs
#	ethcore/src/pod_state.rs
#	ethcore/src/snapshot/block.rs
#	ethcore/src/snapshot/consensus/work.rs
#	ethcore/src/snapshot/mod.rs
#	ethcore/src/snapshot/service.rs
#	ethcore/src/spec/spec.rs
#	ethcore/src/state/backend.rs
#	ethcore/src/trace/db.rs
#	ethcore/src/verification/queue/mod.rs
#	ethcore/src/verification/verification.rs
#	parity/informant.rs
#	rpc/src/v1/helpers/dispatch.rs
#	rpc/src/v1/helpers/light_fetch.rs
#	rpc/src/v1/helpers/signing_queue.rs
#	rpc/src/v1/impls/eth.rs
#	rpc/src/v1/impls/eth_filter.rs
#	rpc/src/v1/impls/eth_pubsub.rs
#	rpc/src/v1/impls/light/eth.rs
#	rpc/src/v1/impls/signing.rs
#	rpc/src/v1/tests/helpers/miner_service.rs
#	rpc/src/v1/tests/helpers/snapshot_service.rs
#	rpc/src/v1/tests/helpers/sync_provider.rs
#	rpc/src/v1/tests/mocked/eth.rs
#	stratum/src/lib.rs
#	sync/src/blocks.rs
#	sync/src/chain.rs
#	sync/src/light_sync/mod.rs
#	sync/src/tests/helpers.rs
#	sync/src/tests/snapshot.rs
#	updater/src/updater.rs
#	util/src/lib.rs
#	util/triehash/src/lib.rs

ethcore/src/snapshot/block.rs

@@ -24,7 +24,7 @@ use views::BlockView;
 use rlp::{DecoderError, RlpStream, UntrustedRlp};
 use bigint::hash::H256;
 use util::Bytes;
-use util::triehash::ordered_trie_root;
+use triehash::ordered_trie_root;
 
 const HEADER_FIELDS: usize = 8;
 const BLOCK_FIELDS: usize = 2;
@@ -193,7 +193,7 @@ mod tests {
 		b.transactions.push(t2.into());
 
 		let receipts_root = b.header.receipts_root().clone();
-		b.header.set_transactions_root(::util::triehash::ordered_trie_root(
+		b.header.set_transactions_root(::triehash::ordered_trie_root(
 			b.transactions.iter().map(::rlp::encode).map(|out| out.into_vec())
 		));
 

ethcore/src/snapshot/consensus/work.rs

@@ -223,7 +223,7 @@ impl Rebuilder for PowRebuilder {
 		use views::BlockView;
 		use snapshot::verify_old_block;
 		use bigint::prelude::U256;
-		use util::triehash::ordered_trie_root;
+		use triehash::ordered_trie_root;
 
 		let rlp = UntrustedRlp::new(chunk);
 		let item_count = rlp.item_count()?;

ethcore/src/snapshot/mod.rs

@@ -33,7 +33,7 @@ use ids::BlockId;
 use bigint::prelude::U256;
 use bigint::hash::H256;
 use util::{Bytes, HashDB, DBValue, snappy};
-use util::Mutex;
+use parking_lot::Mutex;
 use util::journaldb::{self, Algorithm, JournalDB};
 use util::kvdb::KeyValueDB;
 use util::trie::{TrieDB, TrieDBMut, Trie, TrieMut};

ethcore/src/snapshot/service.rs

@@ -36,7 +36,8 @@ use service::ClientIoMessage;
 use io::IoChannel;
 
 use bigint::hash::H256;
-use util::{Bytes, Mutex, RwLock, RwLockReadGuard, UtilError};
+use parking_lot::{Mutex, RwLock, RwLockReadGuard};
+use util::{Bytes, UtilError};
 use util::journaldb::Algorithm;
 use util::kvdb::{Database, DatabaseConfig};
 use util::snappy;

ethcore/src/snapshot/tests/proof_of_work.rs

@@ -24,7 +24,8 @@ use blockchain::BlockChain;
 use snapshot::{chunk_secondary, Error as SnapshotError, Progress, SnapshotComponents};
 use snapshot::io::{PackedReader, PackedWriter, SnapshotReader, SnapshotWriter};
 
-use util::{Mutex, snappy};
+use parking_lot::Mutex;
+use util::snappy;
 use util::kvdb::{self, KeyValueDB, DBTransaction};
 
 use std::sync::Arc;

ethcore/src/snapshot/tests/state.rs

@@ -29,7 +29,7 @@ use bigint::hash::H256;
 use util::journaldb::{self, Algorithm};
 use util::kvdb::{Database, DatabaseConfig};
 use util::memorydb::MemoryDB;
-use util::Mutex;
+use parking_lot::Mutex;
 use devtools::RandomTempPath;
 
 use std::sync::Arc;

ethcore/src/snapshot/watcher.rs

@@ -16,7 +16,7 @@
 
 //! Watcher for snapshot-related chain events.
 
-use util::Mutex;
+use parking_lot::Mutex;
 use client::{BlockChainClient, Client, ChainNotify};
 use ids::BlockId;
 use service::ClientIoMessage;