squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #10595 : hatahet/rust/master, r=thestinger

Browse source 
Closes #10579
This commit is contained in:
bors 2013-11-21 12:56:44 -08:00
commit 61e07d6792
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/ptr.rs
View file

@ -155,7 +155,7 @@ pub unsafe fn replace_ptr<T>(dest: *mut T, mut src: T) -> T {
* Reads the value from `*src` and returns it. Does not copy `*src`.
*/
#[inline(always)]
pub unsafe fn read_ptr<T>(src: *mut T) -> T {
pub unsafe fn read_ptr<T>(src: *T) -> T {
let mut tmp: T = intrinsics::uninit();
copy_nonoverlapping_memory(&mut tmp, src, 1);
tmp
@ -168,7 +168,7 @@ pub unsafe fn read_ptr<T>(src: *mut T) -> T {
#[inline(always)]
pub unsafe fn read_and_zero_ptr<T>(dest: *mut T) -> T {
// Copy the data out from `dest`:
let tmp = read_ptr(dest);
let tmp = read_ptr(&*dest);
// Now zero out `dest`:
zero_memory(dest, 1);

2
src/libstd/vec.rs
View file

@ -1527,7 +1527,7 @@ impl<T> OwnedVector<T> for ~[T] {
let valptr = ptr::to_mut_unsafe_ptr(&mut self[ln - 1u]);
unsafe {
raw::set_len(self, ln - 1u);
Some(ptr::read_ptr(valptr))
Some(ptr::read_ptr(&*valptr))
}
}
}