diff --git a/src/byte_buf.rs b/src/byte_buf.rs index 94ba35e3c6fd3714e1fc55b39667461196c86b74..22ba964cf582202d15e4253f7c045251fa69c747 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 18eb6ccc436124175cd842cea0eab3290325dce7..f9885d528952cf3dc863e7387e8887d172148d7b 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 3133350964b2e3675e833efacb3da02cd3cceff7..3d4df0a79cb6da320be6979430fdf62f706a7aa6 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));