From 5d9a3b4272d3117aa7a58e5a8f058ba8310171f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 11 Oct 2018 11:21:45 +0300 Subject: [PATCH] Use ptr::add(i) instead of ptr::offset(i as isize) --- gstreamer-sdp/src/sdp_time.rs | 2 +- gstreamer/src/miniobject.rs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gstreamer-sdp/src/sdp_time.rs b/gstreamer-sdp/src/sdp_time.rs index 91cbfd435..849ddbbb4 100644 --- a/gstreamer-sdp/src/sdp_time.rs +++ b/gstreamer-sdp/src/sdp_time.rs @@ -49,7 +49,7 @@ impl SDPTime { let len = (*self.0.repeat).len as usize; let mut vec = Vec::with_capacity(len); for i in 0..len { - vec.push(CStr::from_ptr(*arr.offset(i as isize)).to_str().unwrap()); + vec.push(CStr::from_ptr(*arr.add(i)).to_str().unwrap()); } vec } diff --git a/gstreamer/src/miniobject.rs b/gstreamer/src/miniobject.rs index f43a9d3d0..9aea4eca2 100644 --- a/gstreamer/src/miniobject.rs +++ b/gstreamer/src/miniobject.rs @@ -269,7 +269,7 @@ impl<'a, T: MiniObject + 'static> ToGlibContainerFromSlice<'a, *mut *mut T::GstT as *mut *mut T::GstType; for (i, s) in v.iter().enumerate() { - ptr::write(v_ptr.offset(i as isize), s.0); + ptr::write(v_ptr.add(i), s.0); } v_ptr @@ -285,7 +285,7 @@ impl<'a, T: MiniObject + 'static> ToGlibContainerFromSlice<'a, *mut *mut T::GstT as *mut *mut T::GstType; for (i, s) in t.iter().enumerate() { - ptr::write(v_ptr.offset(i as isize), s.to_glib_full()); + ptr::write(v_ptr.add(i), s.to_glib_full()); } v_ptr @@ -368,7 +368,7 @@ impl FromGlibContainerAsVec<*mut T::GstType, *mut *mut let mut res = Vec::with_capacity(num); for i in 0..num { - res.push(from_glib_none(ptr::read(ptr.offset(i as isize)))); + res.push(from_glib_none(ptr::read(ptr.add(i)))); } res } @@ -386,7 +386,7 @@ impl FromGlibContainerAsVec<*mut T::GstType, *mut *mut let mut res = Vec::with_capacity(num); for i in 0..num { - res.push(from_glib_full(ptr::read(ptr.offset(i as isize)))); + res.push(from_glib_full(ptr::read(ptr.add(i)))); } glib_ffi::g_free(ptr as *mut _); res @@ -631,7 +631,7 @@ macro_rules! gst_define_mini_object_wrapper( as *mut *mut $ffi_name; for (i, s) in v.iter().enumerate() { - ::std::ptr::write(v_ptr.offset(i as isize), s.0); + ::std::ptr::write(v_ptr.add(i), s.0); } v_ptr @@ -647,7 +647,7 @@ macro_rules! gst_define_mini_object_wrapper( as *mut *mut $ffi_name; for (i, s) in t.iter().enumerate() { - ::std::ptr::write(v_ptr.offset(i as isize), s.to_glib_full()); + ::std::ptr::write(v_ptr.add(i), s.to_glib_full()); } v_ptr @@ -730,7 +730,7 @@ macro_rules! gst_define_mini_object_wrapper( let mut res = Vec::with_capacity(num); for i in 0..num { - res.push(from_glib_none(::std::ptr::read(ptr.offset(i as isize)))); + res.push(from_glib_none(::std::ptr::read(ptr.add(i)))); } res } @@ -748,7 +748,7 @@ macro_rules! gst_define_mini_object_wrapper( let mut res = Vec::with_capacity(num); for i in 0..num { - res.push(from_glib_full(::std::ptr::read(ptr.offset(i as isize)))); + res.push(from_glib_full(::std::ptr::read(ptr.add(i)))); } glib_ffi::g_free(ptr as *mut _); res