From 63c4065af00a61aef24153a1d3dde76013f433bb Mon Sep 17 00:00:00 2001 From: Ulrik Sverdrup Date: Tue, 1 Mar 2016 20:21:55 +0100 Subject: [PATCH] Use raw pointer casts for slice, str's .as_ptr() We can now use raw pointer casts `*const [T] as *const T` and `*const str as *const u8` instead of .repr() for getting the pointer out of a slice. --- src/libcore/slice.rs | 8 ++++---- src/libcore/str/mod.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs index afda70f4fcc..fb15533f33c 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -285,12 +285,12 @@ fn last(&self) -> Option<&T> { #[inline] unsafe fn get_unchecked(&self, index: usize) -> &T { - &*(self.repr().data.offset(index as isize)) + &*(self.as_ptr().offset(index as isize)) } #[inline] fn as_ptr(&self) -> *const T { - self.repr().data + self as *const [T] as *const T } fn binary_search_by(&self, mut f: F) -> Result where @@ -448,12 +448,12 @@ fn reverse(&mut self) { #[inline] unsafe fn get_unchecked_mut(&mut self, index: usize) -> &mut T { - &mut *(self.repr().data as *mut T).offset(index as isize) + &mut *self.as_mut_ptr().offset(index as isize) } #[inline] fn as_mut_ptr(&mut self) -> *mut T { - self.repr().data as *mut T + self as *mut [T] as *mut T } #[inline] diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 4d367cfd432..a555b859291 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -1894,7 +1894,7 @@ fn slice_shift_char(&self) -> Option<(char, &str)> { #[inline] fn as_ptr(&self) -> *const u8 { - self.repr().data + self as *const str as *const u8 } #[inline] -- 2.44.0