Skip to content

Commit decd9df

Browse files
tchardingtcharding
committed
Enable edition 2018
Add 'edition = "2018"' to the manifest and do a bunch of manual path fixups (use statements and fully qualified paths).
1 parent 20690c3 commit decd9df

File tree

16 files changed

+97
-94
lines changed

16 files changed

+97
-94
lines changed

‎Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ description = "General purpose library for using and interoperating with Bitcoin
1010
keywords = [ "crypto", "bitcoin" ]
1111
readme = "README.md"
1212
exclude = ["./test_data"]
13+
edition = "2018"
1314

1415
# Please don't forget to add relevant features to docs.rs below
1516
[features]

‎src/blockdata/block.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,10 @@ mod tests {
508508
#[cfg(all(test, feature = "unstable"))]
509509
mod benches {
510510
use super::Block;
511-
use EmptyWrite;
512-
use consensus::{deserialize, Encodable};
511+
use crate::EmptyWrite;
512+
use crate::consensus::{deserialize, Encodable};
513513
use test::{black_box, Bencher};
514-
use network::stream_reader::StreamReader;
514+
use crate::network::stream_reader::StreamReader;
515515

516516
#[bench]
517517
#[allow(deprecated)]

‎src/blockdata/opcodes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#[cfg(feature = "serde")] use serde;
2424

25-
#[cfg(feature = "serde")] use prelude::*;
25+
#[cfg(feature = "serde")] use crate::prelude::*;
2626

2727
use core::{fmt, convert::From};
2828

‎src/blockdata/script.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ impl Script {
617617
/// Shorthand for [`Self::verify_with_flags`] with flag [bitcoinconsensus::VERIFY_ALL].
618618
#[cfg(feature="bitcoinconsensus")]
619619
#[cfg_attr(docsrs, doc(cfg(feature = "bitcoinconsensus")))]
620-
pub fn verify (&self, index: usize, amount: ::Amount, spending: &[u8]) -> Result<(), Error> {
620+
pub fn verify (&self, index: usize, amount: crate::Amount, spending: &[u8]) -> Result<(), Error> {
621621
self.verify_with_flags(index, amount, spending, ::bitcoinconsensus::VERIFY_ALL)
622622
}
623623

@@ -630,7 +630,7 @@ impl Script {
630630
/// * `flags` - Verification flags, see [`bitcoinconsensus::VERIFY_ALL`] and similar.
631631
#[cfg(feature="bitcoinconsensus")]
632632
#[cfg_attr(docsrs, doc(cfg(feature = "bitcoinconsensus")))]
633-
pub fn verify_with_flags<F: Into<u32>>(&self, index: usize, amount: ::Amount, spending: &[u8], flags: F) -> Result<(), Error> {
633+
pub fn verify_with_flags<F: Into<u32>>(&self, index: usize, amount: crate::Amount, spending: &[u8], flags: F) -> Result<(), Error> {
634634
Ok(bitcoinconsensus::verify_with_flags (&self.0[..], amount.as_sat(), spending, index, flags.into())?)
635635
}
636636

@@ -1440,7 +1440,7 @@ mod test {
14401440
// a random segwit transaction from the blockchain using native segwit
14411441
let spent = Builder::from(Vec::from_hex("0020701a8d401c84fb13e6baf169d59684e17abd9fa216c8cc5b9fc63d622ff8c58d").unwrap()).into_script();
14421442
let spending = Vec::from_hex("010000000001011f97548fbbe7a0db7588a66e18d803d0089315aa7d4cc28360b6ec50ef36718a0100000000ffffffff02df1776000000000017a9146c002a686959067f4866b8fb493ad7970290ab728757d29f0000000000220020701a8d401c84fb13e6baf169d59684e17abd9fa216c8cc5b9fc63d622ff8c58d04004730440220565d170eed95ff95027a69b313758450ba84a01224e1f7f130dda46e94d13f8602207bdd20e307f062594022f12ed5017bbf4a055a06aea91c10110a0e3bb23117fc014730440220647d2dc5b15f60bc37dc42618a370b2a1490293f9e5c8464f53ec4fe1dfe067302203598773895b4b16d37485cbe21b337f4e4b650739880098c592553add7dd4355016952210375e00eb72e29da82b89367947f29ef34afb75e8654f6ea368e0acdfd92976b7c2103a1b26313f430c4b15bb1fdce663207659d8cac749a0e53d70eff01874496feff2103c96d495bfdd5ba4145e3e046fee45e84a8a48ad05bd8dbb395c011a32cf9f88053ae00000000").unwrap();
1443-
spent.verify(0, ::Amount::from_sat(18393430), spending.as_slice()).unwrap();
1443+
spent.verify(0, crate::Amount::from_sat(18393430), spending.as_slice()).unwrap();
14441444
}
14451445

14461446
#[test]

‎src/blockdata/transaction.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::hashes::hex::FromHex;
3434

3535
use crate::util::endian;
3636
use crate::blockdata::constants::WITNESS_SCALE_FACTOR;
37-
#[cfg(feature="bitcoinconsensus")] use blockdata::script;
37+
#[cfg(feature="bitcoinconsensus")] use crate::blockdata::script;
3838
use crate::blockdata::script::Script;
3939
use crate::blockdata::witness::Witness;
4040
use crate::consensus::{encode, Decodable, Encodable};
@@ -43,7 +43,7 @@ use crate::hash_types::{Sighash, Txid, Wtxid};
4343
use crate::VarInt;
4444

4545
#[cfg(doc)]
46-
use util::sighash::SchnorrSighashType;
46+
use crate::util::sighash::SchnorrSighashType;
4747

4848
/// Used for signature hash for invalid use of SIGHASH_SINGLE.
4949
const UINT256_ONE: [u8; 32] = [
@@ -590,7 +590,7 @@ impl Transaction {
590590
let flags: u32 = flags.into();
591591
for (idx, input) in self.input.iter().enumerate() {
592592
if let Some(output) = spent(&input.previous_output) {
593-
output.script_pubkey.verify_with_flags(idx, ::Amount::from_sat(output.value), tx.as_slice(), flags)?;
593+
output.script_pubkey.verify_with_flags(idx, crate::Amount::from_sat(output.value), tx.as_slice(), flags)?;
594594
} else {
595595
return Err(script::Error::UnknownSpentOutput(input.previous_output.clone()));
596596
}
@@ -1541,10 +1541,10 @@ mod tests {
15411541
#[test]
15421542
#[cfg(feature="bitcoinconsensus")]
15431543
fn test_transaction_verify () {
1544-
use hashes::hex::FromHex;
15451544
use std::collections::HashMap;
1546-
use blockdata::script;
1547-
use blockdata::witness::Witness;
1545+
use crate::hashes::hex::FromHex;
1546+
use crate::blockdata::script;
1547+
use crate::blockdata::witness::Witness;
15481548

15491549
// a random recent segwit transaction from blockchain using both old and segwit inputs
15501550
let mut spending: Transaction = deserialize(Vec::from_hex("020000000001031cfbc8f54fbfa4a33a30068841371f80dbfe166211242213188428f437445c91000000006a47304402206fbcec8d2d2e740d824d3d36cc345b37d9f65d665a99f5bd5c9e8d42270a03a8022013959632492332200c2908459547bf8dbf97c65ab1a28dec377d6f1d41d3d63e012103d7279dfb90ce17fe139ba60a7c41ddf605b25e1c07a4ddcb9dfef4e7d6710f48feffffff476222484f5e35b3f0e43f65fc76e21d8be7818dd6a989c160b1e5039b7835fc00000000171600140914414d3c94af70ac7e25407b0689e0baa10c77feffffffa83d954a62568bbc99cc644c62eb7383d7c2a2563041a0aeb891a6a4055895570000000017160014795d04cc2d4f31480d9a3710993fbd80d04301dffeffffff06fef72f000000000017a91476fd7035cd26f1a32a5ab979e056713aac25796887a5000f00000000001976a914b8332d502a529571c6af4be66399cd33379071c588ac3fda0500000000001976a914fc1d692f8de10ae33295f090bea5fe49527d975c88ac522e1b00000000001976a914808406b54d1044c429ac54c0e189b0d8061667e088ac6eb68501000000001976a914dfab6085f3a8fb3e6710206a5a959313c5618f4d88acbba20000000000001976a914eb3026552d7e3f3073457d0bee5d4757de48160d88ac0002483045022100bee24b63212939d33d513e767bc79300051f7a0d433c3fcf1e0e3bf03b9eb1d70220588dc45a9ce3a939103b4459ce47500b64e23ab118dfc03c9caa7d6bfc32b9c601210354fd80328da0f9ae6eef2b3a81f74f9a6f66761fadf96f1d1d22b1fd6845876402483045022100e29c7e3a5efc10da6269e5fc20b6a1cb8beb92130cc52c67e46ef40aaa5cac5f0220644dd1b049727d991aece98a105563416e10a5ac4221abac7d16931842d5c322012103960b87412d6e169f30e12106bdf70122aabb9eb61f455518322a18b920a4dfa887d30700")
@@ -1601,9 +1601,9 @@ mod tests {
16011601
#[cfg(all(test, feature = "unstable"))]
16021602
mod benches {
16031603
use super::Transaction;
1604-
use EmptyWrite;
1605-
use consensus::{deserialize, Encodable};
1606-
use hashes::hex::FromHex;
1604+
use crate::EmptyWrite;
1605+
use crate::consensus::{deserialize, Encodable};
1606+
use crate::hashes::hex::FromHex;
16071607
use test::{black_box, Bencher};
16081608

16091609
const SOME_TX: &'static str = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000";

‎src/hash_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//! hash).
2121
//!
2222
23-
use crate::hashes::{Hash, sha256, sha256d, hash160};
23+
use crate::hashes::{Hash, sha256, sha256d, hash160, hash_newtype};
2424

2525
macro_rules! impl_hashencode {
2626
($hashtype:ident) => {

‎src/internal_macros.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ macro_rules! impl_array_newtype {
9393
}
9494
}
9595

96-
impl<I> $crate::core::ops::Index<I> for $thing
96+
impl<I> core::ops::Index<I> for $thing
9797
where
98-
[$ty]: $crate::core::ops::Index<I>,
98+
[$ty]: core::ops::Index<I>,
9999
{
100-
type Output = <[$ty] as $crate::core::ops::Index<I>>::Output;
100+
type Output = <[$ty] as core::ops::Index<I>>::Output;
101101

102102
#[inline]
103103
fn index(&self, index: I) -> &Self::Output {

‎src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ mod prelude {
190190
pub use std::io::sink;
191191

192192
#[cfg(not(feature = "std"))]
193-
pub use io_extras::sink;
193+
pub use crate::io_extras::sink;
194194

195195
#[cfg(feature = "hashbrown")]
196196
pub use hashbrown::HashSet;
@@ -204,7 +204,7 @@ mod prelude {
204204
#[cfg(all(test, feature = "unstable"))]
205205
mod tests {
206206
use core::fmt::Arguments;
207-
use io::{IoSlice, Result, Write};
207+
use crate::io::{IoSlice, Result, Write};
208208

209209
#[derive(Default, Clone, Debug, PartialEq, Eq)]
210210
pub struct EmptyWrite;

‎src/serde_utils.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ pub mod btreemap_byte_values {
99

1010
// NOTE: This module can be exactly copied to use with HashMap.
1111

12-
use prelude::*;
13-
use hashes::hex::{FromHex, ToHex};
12+
use crate::prelude::*;
13+
use crate::hashes::hex::{FromHex, ToHex};
1414
use serde;
1515

1616
pub fn serialize<S, T>(v: &BTreeMap<T, Vec<u8>>, s: S) -> Result<S::Ok, S::Error>
1717
where
1818
S: serde::Serializer,
19-
T: serde::Serialize + ::core::hash::Hash + Eq + Ord,
19+
T: serde::Serialize + core::hash::Hash + Eq + Ord,
2020
{
2121
use serde::ser::SerializeMap;
2222

@@ -35,18 +35,18 @@ pub mod btreemap_byte_values {
3535
pub fn deserialize<'de, D, T>(d: D) -> Result<BTreeMap<T, Vec<u8>>, D::Error>
3636
where
3737
D: serde::Deserializer<'de>,
38-
T: serde::Deserialize<'de> + ::core::hash::Hash + Eq + Ord,
38+
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord,
3939
{
40-
use ::core::marker::PhantomData;
40+
use core::marker::PhantomData;
4141

4242
struct Visitor<T>(PhantomData<T>);
4343
impl<'de, T> serde::de::Visitor<'de> for Visitor<T>
4444
where
45-
T: serde::Deserialize<'de> + ::core::hash::Hash + Eq + Ord,
45+
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord,
4646
{
4747
type Value = BTreeMap<T, Vec<u8>>;
4848

49-
fn expecting(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
49+
fn expecting(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
5050
write!(f, "a map with hexadecimal values")
5151
}
5252

@@ -77,13 +77,13 @@ pub mod btreemap_as_seq {
7777

7878
// NOTE: This module can be exactly copied to use with HashMap.
7979

80-
use prelude::*;
80+
use crate::prelude::*;
8181
use serde;
8282

8383
pub fn serialize<S, T, U>(v: &BTreeMap<T, U>, s: S) -> Result<S::Ok, S::Error>
8484
where
8585
S: serde::Serializer,
86-
T: serde::Serialize + ::core::hash::Hash + Eq + Ord,
86+
T: serde::Serialize + core::hash::Hash + Eq + Ord,
8787
U: serde::Serialize,
8888
{
8989
use serde::ser::SerializeSeq;
@@ -103,20 +103,20 @@ pub mod btreemap_as_seq {
103103
pub fn deserialize<'de, D, T, U>(d: D) -> Result<BTreeMap<T, U>, D::Error>
104104
where
105105
D: serde::Deserializer<'de>,
106-
T: serde::Deserialize<'de> + ::core::hash::Hash + Eq + Ord,
106+
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord,
107107
U: serde::Deserialize<'de>,
108108
{
109-
use ::core::marker::PhantomData;
109+
use core::marker::PhantomData;
110110

111111
struct Visitor<T, U>(PhantomData<(T, U)>);
112112
impl<'de, T, U> serde::de::Visitor<'de> for Visitor<T, U>
113113
where
114-
T: serde::Deserialize<'de> + ::core::hash::Hash + Eq + Ord,
114+
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord,
115115
U: serde::Deserialize<'de>,
116116
{
117117
type Value = BTreeMap<T, U>;
118118

119-
fn expecting(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
119+
fn expecting(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
120120
write!(f, "a sequence of pairs")
121121
}
122122

@@ -147,29 +147,29 @@ pub mod btreemap_as_seq_byte_values {
147147

148148
// NOTE: This module can be exactly copied to use with HashMap.
149149

150-
use prelude::*;
150+
use crate::prelude::*;
151151
use serde;
152152

153153
/// A custom key-value pair type that serialized the bytes as hex.
154154
#[derive(Debug, Deserialize)]
155155
struct OwnedPair<T>(
156156
T,
157-
#[serde(deserialize_with = "::serde_utils::hex_bytes::deserialize")]
157+
#[serde(deserialize_with = "crate::serde_utils::hex_bytes::deserialize")]
158158
Vec<u8>,
159159
);
160160

161161
/// A custom key-value pair type that serialized the bytes as hex.
162162
#[derive(Debug, Serialize)]
163163
struct BorrowedPair<'a, T: 'static>(
164164
&'a T,
165-
#[serde(serialize_with = "::serde_utils::hex_bytes::serialize")]
165+
#[serde(serialize_with = "crate::serde_utils::hex_bytes::serialize")]
166166
&'a [u8],
167167
);
168168

169169
pub fn serialize<S, T>(v: &BTreeMap<T, Vec<u8>>, s: S) -> Result<S::Ok, S::Error>
170170
where
171171
S: serde::Serializer,
172-
T: serde::Serialize + ::core::hash::Hash + Eq + Ord + 'static,
172+
T: serde::Serialize + core::hash::Hash + Eq + Ord + 'static,
173173
{
174174
use serde::ser::SerializeSeq;
175175

@@ -188,18 +188,18 @@ pub mod btreemap_as_seq_byte_values {
188188
pub fn deserialize<'de, D, T>(d: D) -> Result<BTreeMap<T, Vec<u8>>, D::Error>
189189
where
190190
D: serde::Deserializer<'de>,
191-
T: serde::Deserialize<'de> + ::core::hash::Hash + Eq + Ord,
191+
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord,
192192
{
193-
use ::core::marker::PhantomData;
193+
use core::marker::PhantomData;
194194

195195
struct Visitor<T>(PhantomData<T>);
196196
impl<'de, T> serde::de::Visitor<'de> for Visitor<T>
197197
where
198-
T: serde::Deserialize<'de> + ::core::hash::Hash + Eq + Ord,
198+
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord,
199199
{
200200
type Value = BTreeMap<T, Vec<u8>>;
201201

202-
fn expecting(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
202+
fn expecting(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
203203
write!(f, "a sequence of pairs")
204204
}
205205

@@ -246,20 +246,20 @@ pub mod hex_bytes {
246246
where
247247
D: serde::Deserializer<'de>, B: serde::Deserialize<'de> + FromHex,
248248
{
249-
struct Visitor<B>(::core::marker::PhantomData<B>);
249+
struct Visitor<B>(core::marker::PhantomData<B>);
250250

251251
impl<'de, B: FromHex> serde::de::Visitor<'de> for Visitor<B> {
252252
type Value = B;
253253

254-
fn expecting(&self, formatter: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
254+
fn expecting(&self, formatter: &mut core::fmt::Formatter) -> core::fmt::Result {
255255
formatter.write_str("an ASCII hex string")
256256
}
257257

258258
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
259259
where
260260
E: serde::de::Error,
261261
{
262-
if let Ok(hex) = ::core::str::from_utf8(v) {
262+
if let Ok(hex) = core::str::from_utf8(v) {
263263
FromHex::from_hex(hex).map_err(E::custom)
264264
} else {
265265
return Err(E::invalid_value(serde::de::Unexpected::Bytes(v), &self));
@@ -278,7 +278,7 @@ pub mod hex_bytes {
278278
if !d.is_human_readable() {
279279
serde::Deserialize::deserialize(d)
280280
} else {
281-
d.deserialize_str(Visitor(::core::marker::PhantomData))
281+
d.deserialize_str(Visitor(core::marker::PhantomData))
282282
}
283283
}
284284
}

0 commit comments

Comments
 (0)