Some more renames for librustc changes

This commit is contained in:
Andrew Poelstra 2015-03-26 10:44:49 -05:00
parent 11dbc717c4
commit 719f616218
4 changed files with 13 additions and 10 deletions

View File

@ -14,3 +14,6 @@ git = "https://github.com/DaGenix/rust-crypto.git"
[dependencies.secp256k1] [dependencies.secp256k1]
git = "https://github.com/apoelstra/bitcoin-secp256k1-rs.git" git = "https://github.com/apoelstra/bitcoin-secp256k1-rs.git"
[dependencies]
rustc-serialize = "*"

View File

@ -120,12 +120,12 @@ macro_rules! impl_array_newtype {
pub fn from_slice(data: &[$ty]) -> $thing { pub fn from_slice(data: &[$ty]) -> $thing {
assert_eq!(data.len(), $len); assert_eq!(data.len(), $len);
unsafe { unsafe {
use std::intrinsics::copy_nonoverlapping_memory; use std::intrinsics::copy_nonoverlapping;
use std::mem; use std::mem;
let mut ret: $thing = mem::uninitialized(); let mut ret: $thing = mem::uninitialized();
copy_nonoverlapping_memory(ret.as_mut_ptr(), copy_nonoverlapping(ret.as_mut_ptr(),
data.as_ptr(), data.as_ptr(),
mem::size_of::<$thing>()); mem::size_of::<$thing>());
ret ret
} }
} }

View File

@ -32,6 +32,7 @@
#![feature(unsafe_destructor)] #![feature(unsafe_destructor)]
#![feature(unboxed_closure_sugar)] #![feature(unboxed_closure_sugar)]
#![feature(unboxed_closures)] #![feature(unboxed_closures)]
#![feature(concat_idents)]
// Coding conventions // Coding conventions
#![warn(non_uppercase_statics)] #![warn(non_uppercase_statics)]
@ -44,9 +45,8 @@ extern crate alloc;
extern crate collections; extern crate collections;
extern crate core; extern crate core;
extern crate rand; extern crate rand;
extern crate serialize; extern crate rustc_serialize as serialize;
extern crate test; extern crate test;
extern crate time;
extern crate secp256k1; extern crate secp256k1;
extern crate crypto; extern crate crypto;

View File

@ -72,12 +72,12 @@ impl fmt::Debug for Address {
impl Clone for Address { impl Clone for Address {
fn clone(&self) -> Address { fn clone(&self) -> Address {
unsafe { unsafe {
use std::intrinsics::copy_nonoverlapping_memory; use std::intrinsics::copy_nonoverlapping;
use std::mem; use std::mem;
let mut ret = mem::uninitialized(); let mut ret = mem::uninitialized();
copy_nonoverlapping_memory(&mut ret, copy_nonoverlapping(&mut ret,
self, self,
mem::size_of::<Address>()); mem::size_of::<Address>());
ret ret
} }
} }