Merge pull request #12 from stevenroose/rust-1.24.0

Add support for Rust v1.24.0

.travis.yml

@@ -3,7 +3,7 @@ rust:
   - stable
   - beta
   - nightly
-  - 1.21.0 # first cargo that supports [patch]
+  - 1.24.0
 
 script:
   - cargo build --verbose

client/examples/test_against_node.rs

@@ -15,7 +15,7 @@ extern crate bitcoincore_rpc;
 
 use bitcoincore_rpc::{Client, Error};
 
-fn main() -> Result<(), Error> {
+fn main_result() -> Result<(), Error> {
     let mut args = std::env::args();
 
     let _exe_name = args.next().unwrap();
@@ -43,3 +43,7 @@ fn main() -> Result<(), Error> {
 
     Ok(())
 }
+
+fn main() {
+    main_result().unwrap();
+}

client/src/client.rs

@@ -10,7 +10,10 @@
 
 use std::result;
 
+use hex;
+use bitcoin;
 use jsonrpc;
+use serde;
 use serde_json;
 
 use bitcoin::util::hash::Sha256dHash;
@@ -96,7 +99,7 @@ fn handle_defaults<'a, 'b>(
     let required_num = args.len() - defaults.len();
 
     if let Some(i) = first_non_null_optional_idx {
-        &args[..=i]
+        &args[..i+1]
     } else {
         &args[..required_num]
     }
@@ -351,7 +354,7 @@ impl Client {
     pub fn create_raw_transaction_hex(
         &self,
         utxos: &[json::CreateRawTransactionInput],
-        outs: Option<&std::collections::HashMap<String, f64>>,
+        outs: Option<&HashMap<String, f64>>,
         locktime: Option<i64>,
         replaceable: Option<bool>,
     ) -> Result<String> {
@@ -369,7 +372,7 @@ impl Client {
     pub fn create_raw_transaction(
         &self,
         utxos: &[json::CreateRawTransactionInput],
-        outs: Option<&std::collections::HashMap<String, f64>>,
+        outs: Option<&HashMap<String, f64>>,
         locktime: Option<i64>,
         replaceable: Option<bool>,
     ) -> Result<Transaction> {
@@ -527,6 +530,7 @@ impl Client {
 #[cfg(tests)]
 mod tests {
     use super::*;
+    use serde_json;
 
     #[test]
     fn test_handle_defaults() -> Result<()> {

client/src/queryable.rs

@@ -8,6 +8,9 @@
 // If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 //
 
+use bitcoin;
+use serde_json;
+
 use bitcoin::util::hash::Sha256dHash;
 use client::Client;
 use client::Result;

json/src/lib.rs

@@ -551,7 +551,7 @@ impl serde::Serialize for AddressType {
     where
         S: serde::Serializer,
     {
-        serializer.serialize_str(match self {
+        serializer.serialize_str(match *self {
             AddressType::Legacy => "legacy",
             AddressType::P2shSegwit => "p2sh-segwit",
             AddressType::Bech32 => "bech32",
@@ -571,7 +571,7 @@ impl<'a> serde::Serialize for PubKeyOrAddress<'a> {
     where
         S: serde::Serializer,
     {
-        match self {
+        match *self {
             PubKeyOrAddress::Address(a) => serde::Serialize::serialize(a, serializer),
             PubKeyOrAddress::PubKey(k) => serde::Serialize::serialize(k, serializer),
         }