From af101fdc331b6f607ed645d86a0f12bc7a2cbc5c Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 23 Aug 2018 16:29:01 +0200
Subject: address Mark-Simulacrum comments

---
 src/libcore/slice/rotate.rs | 7 ++-----
 src/libcore/slice/sort.rs   | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/libcore/slice')

diff --git a/src/libcore/slice/rotate.rs b/src/libcore/slice/rotate.rs
index affe525ae46..07153735300 100644
--- a/src/libcore/slice/rotate.rs
+++ b/src/libcore/slice/rotate.rs
@@ -26,9 +26,6 @@ union RawArray<T> {
 }
 
 impl<T> RawArray<T> {
-    fn ptr(&self) -> *mut T {
-        unsafe { &self.typed as *const T as *mut T }
-    }
     fn cap() -> usize {
         if mem::size_of::<T>() == 0 {
             usize::max_value()
@@ -85,8 +82,8 @@ pub unsafe fn ptr_rotate<T>(mut left: usize, mid: *mut T, mut right: usize) {
         }
     }
 
-    let rawarray = MaybeUninit::<RawArray<T>>::uninitialized();
-    let buf = rawarray.get_ref().ptr();
+    let mut rawarray = MaybeUninit::<RawArray<T>>::uninitialized();
+    let buf = &mut (*rawarray.as_mut_ptr()).typed as *mut [T; 2] as *mut T;
 
     let dim = mid.sub(left).add(right);
     if left <= right {
diff --git a/src/libcore/slice/sort.rs b/src/libcore/slice/sort.rs
index cf0c5d876ab..affe84fbef9 100644
--- a/src/libcore/slice/sort.rs
+++ b/src/libcore/slice/sort.rs
@@ -272,8 +272,8 @@ fn partition_in_blocks<T, F>(v: &mut [T], pivot: &T, is_less: &mut F) -> usize
 
         if start_l == end_l {
             // Trace `block_l` elements from the left side.
-            start_l = unsafe { offsets_l.get_mut().as_mut_ptr() };
-            end_l = unsafe { offsets_l.get_mut().as_mut_ptr() };
+            start_l = offsets_l.as_mut_ptr() as *mut u8;
+            end_l = offsets_l.as_mut_ptr() as *mut u8;
             let mut elem = l;
 
             for i in 0..block_l {
@@ -288,8 +288,8 @@ fn partition_in_blocks<T, F>(v: &mut [T], pivot: &T, is_less: &mut F) -> usize
 
         if start_r == end_r {
             // Trace `block_r` elements from the right side.
-            start_r = unsafe { offsets_r.get_mut().as_mut_ptr() };
-            end_r = unsafe {  offsets_r.get_mut().as_mut_ptr() };
+            start_r = offsets_r.as_mut_ptr() as *mut u8;
+            end_r = offsets_r.as_mut_ptr() as *mut u8;
             let mut elem = r;
 
             for i in 0..block_r {
-- 
cgit 1.4.1-3-g733a5