diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hashmap.rs | 9 | ||||
| -rw-r--r-- | src/libstd/rt/backtrace.rs | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/libstd/collections/hashmap.rs b/src/libstd/collections/hashmap.rs index 7c01a0342ed..098e87243b6 100644 --- a/src/libstd/collections/hashmap.rs +++ b/src/libstd/collections/hashmap.rs @@ -294,8 +294,7 @@ mod table { unsafe { debug_assert!(*self.hashes.offset(idx) != EMPTY_BUCKET); - (&'a *self.keys.offset(idx), - &'a *self.vals.offset(idx)) + (&*self.keys.offset(idx), &*self.vals.offset(idx)) } } @@ -306,8 +305,7 @@ mod table { unsafe { debug_assert!(*self.hashes.offset(idx) != EMPTY_BUCKET); - (&'a *self.keys.offset(idx), - &'a mut *self.vals.offset(idx)) + (&*self.keys.offset(idx), &mut *self.vals.offset(idx)) } } @@ -319,8 +317,7 @@ mod table { unsafe { debug_assert!(*self.hashes.offset(idx) != EMPTY_BUCKET); (transmute(self.hashes.offset(idx)), - &'a mut *self.keys.offset(idx), - &'a mut *self.vals.offset(idx)) + &mut *self.keys.offset(idx), &mut *self.vals.offset(idx)) } } diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index 2e0dcdd8eb6..404887823cb 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -261,7 +261,7 @@ mod imp { use slice::{MutableVector}; extern { - fn backtrace(buf: *mut *const libc::c_void, + fn backtrace(buf: *mut *mut libc::c_void, sz: libc::c_int) -> libc::c_int; } @@ -274,7 +274,7 @@ mod imp { try!(writeln!(w, "stack backtrace:")); // 100 lines should be enough static SIZE: libc::c_int = 100; - let mut buf: [*const libc::c_void, ..SIZE] = unsafe {mem::zeroed()}; + let mut buf: [*mut libc::c_void, ..SIZE] = unsafe {mem::zeroed()}; let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE) as uint}; // skipping the first one as it is write itself |
