Skip to content

Commit 248cb90

Browse files
committed
std::ptr::read_ptr now takes *T instead of *mut T
Closes #10579
1 parent 760942d commit 248cb90

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/libstd/ptr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ pub unsafe fn replace_ptr<T>(dest: *mut T, mut src: T) -> T {
155155
* Reads the value from `*src` and returns it. Does not copy `*src`.
156156
*/
157157
#[inline(always)]
158-
pub unsafe fn read_ptr<T>(src: *mut T) -> T {
158+
pub unsafe fn read_ptr<T>(src: *T) -> T {
159159
let mut tmp: T = intrinsics::uninit();
160160
copy_nonoverlapping_memory(&mut tmp, src, 1);
161161
tmp
@@ -168,7 +168,7 @@ pub unsafe fn read_ptr<T>(src: *mut T) -> T {
168168
#[inline(always)]
169169
pub unsafe fn read_and_zero_ptr<T>(dest: *mut T) -> T {
170170
// Copy the data out from `dest`:
171-
let tmp = read_ptr(dest);
171+
let tmp = read_ptr(&*dest);
172172

173173
// Now zero out `dest`:
174174
zero_memory(dest, 1);

src/libstd/vec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ impl<T> OwnedVector<T> for ~[T] {
15271527
let valptr = ptr::to_mut_unsafe_ptr(&mut self[ln - 1u]);
15281528
unsafe {
15291529
raw::set_len(self, ln - 1u);
1530-
Some(ptr::read_ptr(valptr))
1530+
Some(ptr::read_ptr(&*valptr))
15311531
}
15321532
}
15331533
}

0 commit comments

Comments
 (0)