Merge pull request #65 from rust-bitcoin/rustc-1.14

Rustc 1.14

.travis.yml

@@ -3,6 +3,7 @@ rust:
   - stable
   - beta
   - nightly
+  - 1.14.0
 
 install:
   - git clone https://github.com/bitcoin/secp256k1.git

Cargo.toml

@@ -1,7 +1,7 @@
 
 [package]
 name = "bitcoin"
-version = "0.11.1"
+version = "0.11.2"
 authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"]
 license = "CC0-1.0"
 homepage = "https://github.com/rust-bitcoin/rust-bitcoin/"

src/internal_macros.rs

@@ -277,10 +277,10 @@ macro_rules! display_from_debug {
 }
 
 #[cfg(test)]
-macro_rules! hex_script (($s:expr) => (Script::from($s.from_hex().unwrap())));
+macro_rules! hex_script (($s:expr) => (::blockdata::script::Script::from($s.from_hex().unwrap())));
 
 #[cfg(test)]
-macro_rules! hex_hash (($s:expr) => (Sha256dHash::from(&$s.from_hex().unwrap()[..])));
+macro_rules! hex_hash (($s:expr) => (::util::hash::Sha256dHash::from(&$s.from_hex().unwrap()[..])));
 
 
 // Macros to replace serde's codegen while that is not stable

src/util/address.rs

@@ -285,7 +285,10 @@ impl FromStr for Address {
             x   => return Err(Error::Base58(base58::Error::InvalidVersion(vec![x])))
         };
 
-        Ok(Address { network, payload })
+        Ok(Address {
+            network: network,
+            payload: payload,
+        })
     }
 }
 

src/util/bip143.rs

@@ -101,6 +101,7 @@ impl SighashComponents {
 mod tests {
     use serialize::hex::FromHex;
 
+    use blockdata::transaction::Transaction;
     use network::serialize::deserialize;
     use util::misc::hex_bytes;
 

src/util/hash.rs

@@ -454,7 +454,7 @@ impl <T: BitcoinHash> MerkleRoot for Vec<T> {
 mod tests {
     use strason;
 
-    use network::encodable::VarInt;
+    use network::encodable::{ConsensusEncodable, VarInt};
     use network::serialize::{serialize, deserialize};
     use util::uint::{Uint128, Uint256};
     use super::*;

src/util/privkey.rs

@@ -37,7 +37,11 @@ impl Privkey {
     /// Creates an address from a public key
     #[inline]
     pub fn from_secret_key(key: SecretKey, compressed: bool, network: Network) -> Privkey {
-        Privkey { compressed, network, key }
+        Privkey {
+            compressed: compressed,
+            network: network,
+            key: key,
+        }
     }
 
     /// Computes the public key as supposed to be used with this secret
@@ -164,4 +168,4 @@ mod tests {
         let pk = sk.to_legacy_address(&secp).unwrap();
         assert_eq!(&pk.to_string(), "1GhQvF6dL8xa6wBxLnWmHcQsurx9RxiMc8");
     }
-}
+}