Skip to content
Snippets Groups Projects
Commit e806a59b authored by Carl Lerche's avatar Carl Lerche
Browse files

Fix deprecation warnings

parent 6f00c611
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,7 @@ impl ByteBuf { ...@@ -90,7 +90,7 @@ impl ByteBuf {
let cnt = len as u32; let cnt = len as u32;
unsafe { unsafe {
ptr::copy_nonoverlapping_memory( ptr::copy_nonoverlapping(
dst.as_mut_ptr(), dst.as_mut_ptr(),
self.mem.ptr().offset(self.pos as isize), len); self.mem.ptr().offset(self.pos as isize), len);
} }
...@@ -241,7 +241,7 @@ impl MutByteBuf { ...@@ -241,7 +241,7 @@ impl MutByteBuf {
#[inline] #[inline]
fn write_ptr(&mut self, src: *const u8, len: u32) -> usize { fn write_ptr(&mut self, src: *const u8, len: u32) -> usize {
unsafe { unsafe {
ptr::copy_nonoverlapping_memory( ptr::copy_nonoverlapping(
self.buf.mem.ptr().offset(self.buf.pos as isize), self.buf.mem.ptr().offset(self.buf.pos as isize),
src, len as usize); src, len as usize);
......
...@@ -75,7 +75,7 @@ pub trait Buf { ...@@ -75,7 +75,7 @@ pub trait Buf {
let src = self.bytes(); let src = self.bytes();
cnt = cmp::min(src.len(), len - off); cnt = cmp::min(src.len(), len - off);
ptr::copy_nonoverlapping_memory( ptr::copy_nonoverlapping(
dst[off..].as_mut_ptr(), src.as_ptr(), cnt); dst[off..].as_mut_ptr(), src.as_ptr(), cnt);
off += src.len(); off += src.len();
...@@ -157,7 +157,7 @@ pub trait MutBuf : Sized { ...@@ -157,7 +157,7 @@ pub trait MutBuf : Sized {
let dst = self.mut_bytes(); let dst = self.mut_bytes();
cnt = cmp::min(dst.len(), len - off); cnt = cmp::min(dst.len(), len - off);
ptr::copy_nonoverlapping_memory( ptr::copy_nonoverlapping(
dst.as_mut_ptr(), src[off..].as_ptr(), cnt); dst.as_mut_ptr(), src[off..].as_ptr(), cnt);
off += cnt; off += cnt;
......
...@@ -99,10 +99,10 @@ impl Clone for RingBuf { ...@@ -99,10 +99,10 @@ impl Clone for RingBuf {
let to = self.pos + self.len; let to = self.pos + self.len;
if to > self.cap { 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), ret.ptr.offset(self.pos as isize),
self.ptr.offset(self.pos as isize) as *const u8, self.ptr.offset(self.pos as isize) as *const u8,
cmp::min(self.len, self.cap - self.pos)); cmp::min(self.len, self.cap - self.pos));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment