From 719f6162187a59d9297a12e9a4d8e1891addf8f4 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Thu, 26 Mar 2015 10:44:49 -0500
Subject: [PATCH] Some more renames for librustc changes

---
 Cargo.toml             | 3 +++
 src/internal_macros.rs | 8 ++++----
 src/lib.rs             | 4 ++--
 src/network/address.rs | 8 ++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5f40b6e..cce5815 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,3 +14,6 @@ git = "https://github.com/DaGenix/rust-crypto.git"
 [dependencies.secp256k1]
 git = "https://github.com/apoelstra/bitcoin-secp256k1-rs.git"
 
+[dependencies]
+rustc-serialize = "*"
+
diff --git a/src/internal_macros.rs b/src/internal_macros.rs
index f94a14c..75f4768 100644
--- a/src/internal_macros.rs
+++ b/src/internal_macros.rs
@@ -120,12 +120,12 @@ macro_rules! impl_array_newtype {
       pub fn from_slice(data: &[$ty]) -> $thing {
         assert_eq!(data.len(), $len);
         unsafe {
-          use std::intrinsics::copy_nonoverlapping_memory;
+          use std::intrinsics::copy_nonoverlapping;
           use std::mem;
           let mut ret: $thing = mem::uninitialized();
-          copy_nonoverlapping_memory(ret.as_mut_ptr(),
-                                     data.as_ptr(),
-                                     mem::size_of::<$thing>());
+          copy_nonoverlapping(ret.as_mut_ptr(),
+                              data.as_ptr(),
+                              mem::size_of::<$thing>());
           ret
         }
       }
diff --git a/src/lib.rs b/src/lib.rs
index d9d7b75..8ba4c43 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -32,6 +32,7 @@
 #![feature(unsafe_destructor)]
 #![feature(unboxed_closure_sugar)]
 #![feature(unboxed_closures)]
+#![feature(concat_idents)]
 
 // Coding conventions
 #![warn(non_uppercase_statics)]
@@ -44,9 +45,8 @@ extern crate alloc;
 extern crate collections;
 extern crate core;
 extern crate rand;
-extern crate serialize;
+extern crate rustc_serialize as serialize;
 extern crate test;
-extern crate time;
 
 extern crate secp256k1;
 extern crate crypto;
diff --git a/src/network/address.rs b/src/network/address.rs
index d3ae116..0ec53b0 100644
--- a/src/network/address.rs
+++ b/src/network/address.rs
@@ -72,12 +72,12 @@ impl fmt::Debug for Address {
 impl Clone for Address {
   fn clone(&self) -> Address {
     unsafe {
-      use std::intrinsics::copy_nonoverlapping_memory;
+      use std::intrinsics::copy_nonoverlapping;
       use std::mem;
       let mut ret = mem::uninitialized();
-      copy_nonoverlapping_memory(&mut ret,
-                                 self,
-                                 mem::size_of::<Address>());
+      copy_nonoverlapping(&mut ret,
+                          self,
+                          mem::size_of::<Address>());
       ret
     }
   }