Merge rust-bitcoin#4888: Do trivial import clean up

4341857 Do trivial import clean up (Tobin C. Harding)

Pull request description:

  Refactor only, no logic changes.


ACKs for top commit:
  apoelstra:
    ACK 4341857; successfully ran local tests


Tree-SHA512: 7ddc2db560481fc2636aacc002f92ed4fd4889d5b716cf0119d188ca492c65aafcca07b53798e13678545b764c69e93f7a2a04477c8809f7e8e6fcd9cf5f5037

Author: apoelstra

bitcoin/src/blockdata/block.rs

@@ -14,17 +14,13 @@ use hashes::{sha256d, HashEngine};
 use internals::{compact_size, ToU64};
 use io::{BufRead, Write};
 
-use super::transaction::Coinbase;
-use super::Weight;
-use crate::consensus::encode::WriteExt as _;
-use crate::consensus::{encode, Decodable, Encodable};
+use crate::consensus::encode::{self, Decodable, Encodable, WriteExt as _};
 use crate::merkle_tree::{MerkleNode as _, TxMerkleNode, WitnessMerkleNode};
 use crate::network::Params;
-use crate::pow::{Target, Work};
 use crate::prelude::Vec;
 use crate::script::{self, ScriptExt as _};
-use crate::transaction::{Transaction, TransactionExt as _, Wtxid};
-use crate::{internal_macros, BlockTime};
+use crate::transaction::{Coinbase, Transaction, TransactionExt as _, Wtxid};
+use crate::{internal_macros, BlockTime, Target, Weight, Work};
 
 #[rustfmt::skip]                // Keep public re-exports separate.
 #[doc(inline)]