Merge pull request #143 from stevenroose/msrv-1.29

Set MSRV to 1.29 and fix README & Travis accordingly

Author: stevenroose

.travis.yml

@@ -3,30 +3,12 @@ rust:
   - stable
   - beta
   - nightly
-  - 1.24.0
+  - 1.29.0
 env:
   - BITCOINVERSION=0.18.0
   - BITCOINVERSION=0.18.1
   - BITCOINVERSION=0.19.0.1
   - BITCOINVERSION=0.19.1
 
-matrix:
-  allow_failures:
-    rust: 1.24.0
-
 script:
-  - |
-    if [[ "$TRAVIS_RUST_VERSION" == stable ]]
-    then
-      rustup component add rustfmt
-      cargo fmt --all -- --check
-    fi
-  - cargo build --verbose
-  - cargo test --verbose
-  - cargo build --verbose --examples
-  # Integration test
-  - wget https://bitcoincore.org/bin/bitcoin-core-$BITCOINVERSION/bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
-  - tar -xzvf bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
-  - export PATH=$PATH:$(pwd)/bitcoin-$BITCOINVERSION/bin
-  - (cd integration_test && ./run.sh)
-
+  - ./contrib/test.sh

README.md

@@ -35,3 +35,18 @@ fn main() {
 ```
 
 See `client/examples/` for more usage examples. 
+
+
+# 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 run the following version-pinning command:
+```
+cargo update --package "cc" --precise "1.0.41"
+cargo update --package "cfg-if" --precise "0.1.9"
+cargo update --package "unicode-normalization" --precise "0.1.9"
+cargo update --package "serde_json" --precise "1.0.39"
+cargo update --package "serde" --precise "1.0.98"
+cargo update --package "serde_derive" --precise "1.0.98"
+```

client/src/client.rs

@@ -25,7 +25,6 @@ use bitcoin::{
     Address, Amount, Block, BlockHeader, OutPoint, PrivateKey, PublicKey, Script, Transaction,
 };
 use log::Level::{Debug, Trace, Warn};
-use serde::{Deserialize, Serialize};
 
 use error::*;
 use json;
@@ -363,11 +362,15 @@ pub trait RpcApi: Sized {
             use Error::UnexpectedStructure as err;
 
             // First, remove both incompatible softfork fields.
-            let map = raw.as_object_mut().ok_or(err)?;
-            let bip9_softforks = map.remove("bip9_softforks").ok_or(err)?;
-            let old_softforks = map.remove("softforks").ok_or(err)?;
-            // Put back an empty "softforks" field.
-            map.insert("softforks".into(), serde_json::Map::new().into());
+            // We need to scope the mutable ref here for v1.29 borrowck.
+            let (bip9_softforks, old_softforks) = {
+                let map = raw.as_object_mut().ok_or(err)?;
+                let bip9_softforks = map.remove("bip9_softforks").ok_or(err)?;
+                let old_softforks = map.remove("softforks").ok_or(err)?;
+                // Put back an empty "softforks" field.
+                map.insert("softforks".into(), serde_json::Map::new().into());
+                (bip9_softforks, old_softforks)
+            };
             let mut ret: json::GetBlockchainInfoResult = serde_json::from_value(raw)?;
 
             // Then convert both softfork types and add them.
@@ -399,7 +402,7 @@ pub trait RpcApi: Sized {
                 }
                 let sf: OldBip9SoftFork = serde_json::from_value(sf.clone())?;
                 ret.softforks.insert(
-                    id.into(),
+                    id.clone(),
                     json::Softfork {
                         type_: json::SoftforkType::Bip9,
                         bip9: Some(json::Bip9SoftforkInfo {

contrib/test.sh

@@ -0,0 +1,27 @@
+
+# Pin dependencies for Rust v1.29
+if [ "$TRAVIS_RUST_VERSION" = "1.29.0" ]; then
+    cargo generate-lockfile --verbose
+    cargo update --verbose --package "cc" --precise "1.0.41"
+    cargo update --verbose --package "cfg-if" --precise "0.1.9"
+    cargo update --verbose --package "unicode-normalization" --precise "0.1.9"
+    cargo update --verbose --package "serde_json" --precise "1.0.39"
+    cargo update --verbose --package "serde" --precise "1.0.98"
+    cargo update --verbose --package "serde_derive" --precise "1.0.98"
+fi
+
+if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then
+  rustup component add rustfmt
+  cargo fmt --all -- --check
+fi
+
+cargo build --verbose
+cargo test --verbose
+cargo build --verbose --examples
+
+# Integration test
+wget https://bitcoincore.org/bin/bitcoin-core-$BITCOINVERSION/bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
+tar -xzvf bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
+export PATH=$PATH:$(pwd)/bitcoin-$BITCOINVERSION/bin
+(cd integration_test && ./run.sh)
+