Skip to content

Commit 1d194d3

Browse files
committed
Merge #383: integration_test: Enable edition 2018
3188d06 Remove unneeded import (Tobin C. Harding) abb2f55 Use the anonymous lifetime (Tobin C. Harding) 45a5d49 Enable edition 2018 (Tobin C. Harding) Pull request description: As we did for the main crate, enable edition 2018 in the `integration_test` crate. ACKs for top commit: apoelstra: ACK 3188d06 sanket1729: ACK 3188d06 Tree-SHA512: 8183cbc074a36175f1a7f723e89629577e13c646274730abc4bb9b5e16c2a250dad4dfb4059283ab7523d9586d9728f0b381afe991e9ec51c9ea641b5dc60480
2 parents 88195ff + 3188d06 commit 1d194d3

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

integration_test/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "integration_tests_miniscript"
33
version = "0.1.0"
44
authors = ["Steven Roose <[email protected]>", "Sanket K <[email protected]>"]
5+
edition = "2018"
56

67
[dependencies]
78
miniscript = {path = "../"}

integration_test/src/main.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
//!
33
//! This is how some external user would use rust-miniscript
44
5-
extern crate bitcoincore_rpc;
6-
extern crate log;
7-
8-
extern crate bitcoin;
9-
extern crate miniscript;
10-
115
use bitcoincore_rpc::{Auth, Client, RpcApi};
126

137
mod test_cpp;
@@ -18,11 +12,11 @@ use crate::test_util::TestData;
1812
struct StdLogger;
1913

2014
impl log::Log for StdLogger {
21-
fn enabled(&self, metadata: &log::Metadata) -> bool {
15+
fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
2216
metadata.target().contains("jsonrpc") || metadata.target().contains("bitcoincore_rpc")
2317
}
2418

25-
fn log(&self, record: &log::Record) {
19+
fn log(&self, record: &log::Record<'_>) {
2620
if self.enabled(record.metadata()) {
2721
println!(
2822
"[{}][{}]: {}",

integration_test/src/test_util.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717
//! The keys/hashes are automatically translated so that the tests knows how to satisfy things that don't end with !
1818
//!
1919
20-
extern crate rand;
21-
22-
use self::rand::RngCore;
2320
use bitcoin::hashes::{hex::ToHex, Hash};
2421
use miniscript::descriptor::{SinglePub, SinglePubKey};
2522
use miniscript::{Descriptor, DescriptorPublicKey, Miniscript, ScriptContext, TranslatePk};
23+
use rand::RngCore;
2624
use std::str::FromStr;
2725

28-
use bitcoin;
2926
use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d};
3027
use bitcoin::secp256k1;
3128

0 commit comments

Comments
 (0)