Merge #365: Enable edition 2018

c60bf1e Fix edition-idioms (Tobin C. Harding)
08bce7a Update to use edition 2018 (Tobin C. Harding)
2a83fa0 Update MSRV in CI and Readme from 1.29 to 1.41.1 (Tobin C. Harding)
2b73bb2 integration_test: Use latest bitcoin release (Tobin C. Harding)

Pull request description:

  Update the MSRV to Rust 1.41.1 and enable edition 2018.

  I'm not sure how we want to merge these MSRV PRs across the stack but here is the `rust-miniscript` one.

  Discussion: rust-bitcoin/rust-bitcoin#510 (comment)

ACKs for top commit:
  sanket1729:
    ACK c60bf1e. redid the entire process to match the diff.

Tree-SHA512: 353cd793df4ba91b897e0dc58547b074ade7c23e7d75447c957ba947a12ff72c4504cb46036fdffea1591e429ee9eb056182dcffc89e301c72e3c5c433e8de16

Author: sanket1729

.github/workflows/rust.yml

@@ -54,7 +54,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.29.0
+          - 1.41.1
           - beta
     steps:
       - name: Checkout Crate
@@ -65,13 +65,6 @@ jobs:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
-      - name: Pin deps if rust 1.29
-        if: matrix.rust == '1.29.0'
-        run: |
-            cargo generate-lockfile --verbose && \
-            cargo update --verbose --package "cc" --precise "1.0.41" && \
-            cargo update --verbose --package "serde" --precise "1.0.98" && \
-            cargo update --verbose --package "serde_derive" --precise "1.0.98"
       - name: Running cargo
         run: ./contrib/test.sh
 

Cargo.toml

@@ -8,6 +8,7 @@ repository = "https://github.com/rust-bitcoin/rust-miniscript/"
 description = "Miniscript: a subset of Bitcoin Script designed for analysis"
 keywords = [ "crypto", "bitcoin"]
 readme = "README.md"
+edition = "2018"
 
 [features]
 compiler = []

README.md

@@ -1,9 +1,6 @@
 ![Build](https://github.com/rust-bitcoin/rust-miniscript/workflows/Continuous%20integration/badge.svg)
 
-**Minimum Supported Rust Version:** 1.29.0
-
-*This crate uses "2015" edition and won't be ported over "2018" edition
-in the near future as this will change the MSRV to 1.31.*
+**Minimum Supported Rust Version:** 1.41.1
 
 # Miniscript
 
@@ -36,22 +33,7 @@ or in [the `examples/` directory](https://github.com/apoelstra/rust-miniscript/t
 
 
 ## Minimum Supported Rust Version (MSRV)
-This library should always compile with any combination of features on **Rust 1.29**.
-
-Because some dependencies have broken the build in minor/patch releases, to compile with 1.29.0 you will need to
-generate the lockfile and run the following version-pinning command:
-```
-cargo generate-lockfile --verbose
-cargo update -p cc --precise "1.0.41" --verbose
-```
-
-In order to use the `use-serde` feature or to build the unit tests with 1.29.0,
-the following version-pinning commands are also needed:
-```
-cargo update --package "serde" --precise "1.0.98"
-cargo update --package "serde_derive" --precise "1.0.98"
-```
-
+This library should always compile with any combination of features on **Rust 1.41.1**.
 
 ## Contributing
 Contributions are generally welcome. If you intend to make larger changes please

examples/parse.rs

@@ -14,8 +14,8 @@
 
 //! Example: Parsing a descriptor from a string
 
-extern crate bitcoin;
-extern crate miniscript;
+use bitcoin;
+use miniscript;
 
 use miniscript::{descriptor::DescriptorType, Descriptor, DescriptorTrait};
 use std::str::FromStr;

examples/psbt.rs

@@ -1,5 +1,4 @@
-extern crate bitcoin;
-extern crate miniscript;
+use bitcoin;
 
 use bitcoin::consensus::encode::deserialize;
 use bitcoin::hashes::hex::FromHex;

examples/sign_multisig.rs

@@ -14,8 +14,8 @@
 
 //! Example: Signing a 2-of-3 multisignature
 
-extern crate bitcoin;
-extern crate miniscript;
+use bitcoin;
+use miniscript;
 
 use bitcoin::blockdata::witness::Witness;
 use bitcoin::secp256k1; // secp256k1 re-exported from rust-bitcoin

examples/verify_tx.rs

@@ -14,8 +14,8 @@
 
 //! Example: Verifying a signed transaction
 
-extern crate bitcoin;
-extern crate miniscript;
+use bitcoin;
+use miniscript;
 
 use bitcoin::consensus::Decodable;
 use bitcoin::util::sighash;

examples/xpub_descriptors.rs

@@ -14,8 +14,6 @@
 
 //! Example: Parsing a xpub and getting address
 
-extern crate miniscript;
-
 use miniscript::bitcoin::{self, secp256k1};
 use miniscript::{Descriptor, DescriptorPublicKey, DescriptorTrait, TranslatePk2};
 

integration_test/Cargo.toml

@@ -8,6 +8,6 @@ miniscript = {path = "../"}
 
 # Until 0.26 support is released on rust-bitcoincore-rpc
 bitcoincore-rpc = {git = "https://github.com/sanket1729/rust-bitcoincore-rpc",rev = "1ee9a3e808815702ac1a4b974689fcb33b5648c3"}
-bitcoin = {ver = "0.28.0-rc.1", features = ["rand"]}
+bitcoin = { version = "0.28", features = ["rand"]}
 log = "0.4"
 rand = "0.8.4"

integration_test/src/main.rs

@@ -13,7 +13,7 @@ use bitcoincore_rpc::{Auth, Client, RpcApi};
 mod test_cpp;
 mod test_desc;
 mod test_util;
-use test_util::TestData;
+use crate::test_util::TestData;
 
 struct StdLogger;