Migrate tx-graph, tx-pool and trie to the 2018 edition (#1611)

substrate/core/transaction-pool/src/api.rs

@@ -34,7 +34,7 @@ use sr_primitives::{
 	transaction_validity::TransactionValidity,
 };
 
-use error;
+use crate::error;
 
 /// The transaction pool logic
 pub struct ChainApi<T, Block> {

substrate/core/transaction-pool/src/error.rs

@@ -18,6 +18,9 @@
 
 use client;
 use txpool;
+use error_chain::{
+	error_chain, error_chain_processing, impl_error_chain_processed, impl_extract_backtrace, impl_error_chain_kind
+};
 
 error_chain! {
 	links {

substrate/core/transaction-pool/src/lib.rs

@@ -19,21 +19,6 @@
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
 
-extern crate parity_codec;
-extern crate sr_primitives;
-extern crate substrate_client as client;
-extern crate substrate_primitives;
-
-pub extern crate substrate_transaction_graph as txpool;
-
-#[macro_use]
-extern crate error_chain;
-
-#[cfg(test)]
-extern crate substrate_test_client as test_client;
-#[cfg(test)]
-extern crate substrate_keyring as keyring;
-
 mod api;
 #[cfg(test)]
 mod tests;
@@ -41,3 +26,4 @@ mod tests;
 pub mod error;
 
 pub use api::ChainApi;
+pub use txpool;