Enable edition 2018

Add `edition = "2018"` to each of the three subcrate manifest files.
Fix `::serde` imports and remove some of the unnecessary instances of
`extern crate Foo`.

Author: tcharding

client/Cargo.toml

@@ -12,6 +12,7 @@ repository = "https://github.com/rust-bitcoin/rust-bitcoincore-rpc/"
 description = "RPC client library for the Bitcoin Core JSON-RPC API."
 keywords = ["crypto", "bitcoin", "bitcoin-core", "rpc"]
 readme = "README.md"
+edition = "2018"
 
 [lib]
 name = "bitcoincore_rpc"

client/src/lib.rs

@@ -21,13 +21,12 @@ extern crate log;
 #[allow(unused)]
 #[macro_use] // `macro_use` is needed for v1.24.0 compilation.
 extern crate serde;
-extern crate serde_json;
 
 pub extern crate jsonrpc;
 
 pub extern crate bitcoincore_rpc_json;
-pub use bitcoincore_rpc_json as json;
 pub use crate::json::bitcoin;
+pub use bitcoincore_rpc_json as json;
 
 mod client;
 mod error;

integration_test/Cargo.toml

@@ -2,6 +2,7 @@
 name = "integration_test"
 version = "0.1.0"
 authors = ["Steven Roose <[email protected]>"]
+edition = "2018"
 
 [dependencies]
 bitcoincore-rpc = { path = "../client" }

integration_test/src/main.rs

@@ -10,11 +10,8 @@
 
 #![deny(unused)]
 
-extern crate bitcoin;
-extern crate bitcoincore_rpc;
 #[macro_use]
 extern crate lazy_static;
-extern crate log;
 
 use std::collections::HashMap;
 

json/Cargo.toml

@@ -12,6 +12,7 @@ repository = "https://github.com/rust-bitcoin/rust-bitcoincore-rpc/"
 description = "JSON-enabled type structs for bitcoincore-rpc crate."
 keywords = [ "crypto", "bitcoin", "bitcoin-core", "rpc" ]
 readme = "README.md"
+edition = "2018"
 
 [lib]
 name = "bitcoincore_rpc_json"

json/src/lib.rs

@@ -184,7 +184,7 @@ pub struct GetBlockResult {
     pub weight: usize,
     pub height: usize,
     pub version: i32,
-    #[serde(default, with = "::serde_hex::opt")]
+    #[serde(default, with = "crate::serde_hex::opt")]
     pub version_hex: Option<Vec<u8>>,
     pub merkleroot: bitcoin::TxMerkleNode,
     pub tx: Vec<bitcoin::Txid>,
@@ -193,7 +193,7 @@ pub struct GetBlockResult {
     pub nonce: u32,
     pub bits: String,
     pub difficulty: f64,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub chainwork: Vec<u8>,
     pub n_tx: usize,
     pub previousblockhash: Option<bitcoin::BlockHash>,
@@ -207,7 +207,7 @@ pub struct GetBlockHeaderResult {
     pub confirmations: i32,
     pub height: usize,
     pub version: i32,
-    #[serde(default, with = "::serde_hex::opt")]
+    #[serde(default, with = "crate::serde_hex::opt")]
     pub version_hex: Option<Vec<u8>>,
     #[serde(rename = "merkleroot")]
     pub merkle_root: bitcoin::TxMerkleNode,
@@ -217,7 +217,7 @@ pub struct GetBlockHeaderResult {
     pub nonce: u32,
     pub bits: String,
     pub difficulty: f64,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub chainwork: Vec<u8>,
     pub n_tx: usize,
     #[serde(rename = "previousblockhash")]
@@ -505,7 +505,7 @@ pub struct GetMiningInfoResult {
 #[serde(rename_all = "camelCase")]
 pub struct GetRawTransactionResultVinScriptSig {
     pub asm: String,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub hex: Vec<u8>,
 }
 
@@ -520,7 +520,7 @@ impl GetRawTransactionResultVinScriptSig {
 pub struct GetRawTransactionResultVin {
     pub sequence: u32,
     /// The raw scriptSig in case of a coinbase tx.
-    #[serde(default, with = "::serde_hex::opt")]
+    #[serde(default, with = "crate::serde_hex::opt")]
     pub coinbase: Option<Vec<u8>>,
     /// Not provided for coinbase txs.
     pub txid: Option<bitcoin::Txid>,
@@ -546,7 +546,7 @@ impl GetRawTransactionResultVin {
 #[serde(rename_all = "camelCase")]
 pub struct GetRawTransactionResultVoutScriptPubKey {
     pub asm: String,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub hex: Vec<u8>,
     pub req_sigs: Option<usize>,
     #[serde(rename = "type")]
@@ -574,7 +574,7 @@ pub struct GetRawTransactionResultVout {
 pub struct GetRawTransactionResult {
     #[serde(rename = "in_active_chain")]
     pub in_active_chain: Option<bool>,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub hex: Vec<u8>,
     pub txid: bitcoin::Txid,
     pub hash: bitcoin::Wtxid,
@@ -593,7 +593,7 @@ pub struct GetRawTransactionResult {
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct GetBlockFilterResult {
     pub header: bitcoin::FilterHash,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub filter: Vec<u8>,
 }
 
@@ -683,7 +683,7 @@ pub struct GetTransactionResult {
     #[serde(default, with = "bitcoin::util::amount::serde::as_btc::opt")]
     pub fee: Option<SignedAmount>,
     pub details: Vec<GetTransactionResultDetail>,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub hex: Vec<u8>,
 }
 
@@ -794,7 +794,7 @@ pub struct SignRawTransactionResultError {
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SignRawTransactionResult {
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub hex: Vec<u8>,
     pub complete: bool,
     pub errors: Option<Vec<SignRawTransactionResultError>>,
@@ -901,11 +901,11 @@ pub struct GetAddressInfoResultEmbedded {
     #[serde(rename = "is_witness")]
     pub is_witness: Option<bool>,
     pub witness_version: Option<u32>,
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub witness_program: Vec<u8>,
     pub script: Option<ScriptPubkeyType>,
     /// The redeemscript for the p2sh address.
-    #[serde(default, with = "::serde_hex::opt")]
+    #[serde(default, with = "crate::serde_hex::opt")]
     pub hex: Option<Vec<u8>>,
     pub pubkeys: Option<Vec<PublicKey>>,
     #[serde(rename = "sigsrequired")]
@@ -953,11 +953,11 @@ pub struct GetAddressInfoResult {
     #[serde(rename = "iswitness")]
     pub is_witness: Option<bool>,
     pub witness_version: Option<u32>,
-    #[serde(default, with = "::serde_hex::opt")]
+    #[serde(default, with = "crate::serde_hex::opt")]
     pub witness_program: Option<Vec<u8>>,
     pub script: Option<ScriptPubkeyType>,
     /// The redeemscript for the p2sh address.
-    #[serde(default, with = "::serde_hex::opt")]
+    #[serde(default, with = "crate::serde_hex::opt")]
     pub hex: Option<Vec<u8>>,
     pub pubkeys: Option<Vec<PublicKey>>,
     #[serde(rename = "sigsrequired")]
@@ -1002,7 +1002,7 @@ pub struct GetBlockchainInfoResult {
     #[serde(rename = "initialblockdownload")]
     pub initial_block_download: bool,
     /// Total amount of work in active chain, in hexadecimal
-    #[serde(rename = "chainwork", with = "::serde_hex")]
+    #[serde(rename = "chainwork", with = "crate::serde_hex")]
     pub chain_work: Vec<u8>,
     /// The estimated size of the block and undo files on disk
     pub size_on_disk: u64,
@@ -1474,7 +1474,7 @@ pub enum GetBlockTemplateModes {
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct GetBlockTemplateResult {
     /// The compressed difficulty in hexadecimal
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub bits: Vec<u8>,
     /// The previous block hash the current template is mining on
     #[serde(rename = "previousblockhash")]
@@ -1530,7 +1530,7 @@ pub struct GetBlockTemplateResult {
     #[serde(rename = "coinbasevalue", with = "bitcoin::util::amount::serde::as_sat", default)]
     pub coinbase_value: Amount,
     /// The number which valid hashes must be less than, in big-endian
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub target: Vec<u8>,
     /// The minimum timestamp appropriate for the next block time. Expressed as
     /// UNIX timestamp.
@@ -1540,7 +1540,7 @@ pub struct GetBlockTemplateResult {
     /// block
     pub mutable: Vec<GetBlockTemplateResulMutations>,
     /// A range of valid nonces
-    #[serde(with = "::serde_hex", rename = "noncerange")]
+    #[serde(with = "crate::serde_hex", rename = "noncerange")]
     pub nonce_range: Vec<u8>,
 }
 
@@ -1553,7 +1553,7 @@ pub struct GetBlockTemplateResultTransaction {
     #[serde(rename = "hash")]
     pub wtxid: bitcoin::Wtxid,
     /// The serilaized transaction bytes
-    #[serde(with = "::serde_hex", rename = "data")]
+    #[serde(with = "crate::serde_hex", rename = "data")]
     pub raw_tx: Vec<u8>,
     // The transaction fee
     #[serde(with = "bitcoin::util::amount::serde::as_sat")]
@@ -1677,7 +1677,7 @@ pub struct WalletCreateFundedPsbtOptions {
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct FinalizePsbtResult {
     pub psbt: Option<String>,
-    #[serde(default, with = "::serde_hex::opt")]
+    #[serde(default, with = "crate::serde_hex::opt")]
     pub hex: Option<Vec<u8>>,
     pub complete: bool,
 }
@@ -1804,7 +1804,7 @@ pub struct FundRawTransactionOptions {
 #[derive(Deserialize, Clone, PartialEq, Eq, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct FundRawTransactionResult {
-    #[serde(with = "::serde_hex")]
+    #[serde(with = "crate::serde_hex")]
     pub hex: Vec<u8>,
     #[serde(with = "bitcoin::util::amount::serde::as_btc")]
     pub fee: Amount,