From e806a59b4a6f0f3822342a09fb7d54bef005a402 Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Mon, 9 Mar 2015 22:30:41 -0700
Subject: [PATCH] Fix deprecation warnings
---
src/byte_buf.rs | 4 ++--
src/lib.rs | 4 ++--
src/ring.rs | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/byte_buf.rs b/src/byte_buf.rs
index 94ba35e..22ba964 100644
--- a/src/byte_buf.rs
+++ b/src/byte_buf.rs
@@ -90,7 +90,7 @@ impl ByteBuf {
let cnt = len as u32;
unsafe {
- ptr::copy_nonoverlapping_memory(
+ ptr::copy_nonoverlapping(
dst.as_mut_ptr(),
self.mem.ptr().offset(self.pos as isize), len);
}
@@ -241,7 +241,7 @@ impl MutByteBuf {
#[inline]
fn write_ptr(&mut self, src: *const u8, len: u32) -> usize {
unsafe {
- ptr::copy_nonoverlapping_memory(
+ ptr::copy_nonoverlapping(
self.buf.mem.ptr().offset(self.buf.pos as isize),
src, len as usize);
diff --git a/src/lib.rs b/src/lib.rs
index 18eb6cc..f9885d5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -75,7 +75,7 @@ pub trait Buf {
let src = self.bytes();
cnt = cmp::min(src.len(), len - off);
- ptr::copy_nonoverlapping_memory(
+ ptr::copy_nonoverlapping(
dst[off..].as_mut_ptr(), src.as_ptr(), cnt);
off += src.len();
@@ -157,7 +157,7 @@ pub trait MutBuf : Sized {
let dst = self.mut_bytes();
cnt = cmp::min(dst.len(), len - off);
- ptr::copy_nonoverlapping_memory(
+ ptr::copy_nonoverlapping(
dst.as_mut_ptr(), src[off..].as_ptr(), cnt);
off += cnt;
diff --git a/src/ring.rs b/src/ring.rs
index 3133350..3d4df0a 100644
--- a/src/ring.rs
+++ b/src/ring.rs
@@ -99,10 +99,10 @@ impl Clone for RingBuf {
let to = self.pos + self.len;
if to > self.cap {
- ptr::copy_memory(ret.ptr, self.ptr as *const u8, to % self.cap);
+ ptr::copy(ret.ptr, self.ptr as *const u8, to % self.cap);
}
- ptr::copy_memory(
+ ptr::copy(
ret.ptr.offset(self.pos as isize),
self.ptr.offset(self.pos as isize) as *const u8,
cmp::min(self.len, self.cap - self.pos));
--
GitLab