address Mark-Simulacrum comments

diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index caea88815145cf6cf614c9122107be0b10bd4f18..6312aa439d20f9075f9a5ca98b9fb01010ff75f9 100644 (file)
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -145,7 +145,7 @@ pub unsafe fn swap<T>(x: *mut T, y: *mut T) {
     let mut tmp = MaybeUninit::<T>::uninitialized();
 
     // Perform the swap
-    copy_nonoverlapping(x, tmp.get_mut(), 1);
+    copy_nonoverlapping(x, tmp.as_mut_ptr(), 1);
     copy(y, x, 1); // `x` and `y` may overlap
     copy_nonoverlapping(tmp.get_ref(), y, 1);
 }
@@ -293,7 +293,7 @@ pub unsafe fn replace<T>(dest: *mut T, mut src: T) -> T {
 #[stable(feature = "rust1", since = "1.0.0")]
 pub unsafe fn read<T>(src: *const T) -> T {
     let mut tmp = MaybeUninit::<T>::uninitialized();
-    copy_nonoverlapping(src, tmp.get_mut(), 1);
+    copy_nonoverlapping(src, tmp.as_mut_ptr(), 1);
     tmp.into_inner()
 }
 

diff --git a/src/libcore/slice/rotate.rs b/src/libcore/slice/rotate.rs
index affe525ae46e97969bfeaf7f62109997bdbaf140..07153735300b89ccc376e472aac7f0bcbfb51f80 100644 (file)
--- 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 cf0c5d876abda042fa53d046057c20c05128f0c6..affe84fbef91f2e6908385556b1e3b8d0d90c2dd 100644 (file)
--- a/src/libcore/slice/sort.rs
+++ b/src/libcore/slice/sort.rs
@@ -272,8 +272,8 @@ fn width<T>(l: *mut T, r: *mut T) -> 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 width<T>(l: *mut T, r: *mut T) -> 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 {