diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 95cbc5aa4097e..b869f574beb9b 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -1957,11 +1957,8 @@ impl<'self> StrSlice<'self> for &'self str { */ #[inline] fn as_imm_buf(&self, f: &fn(*u8, uint) -> T) -> T { - unsafe { - let v: *(*u8, uint) = cast::transmute(self); - let (buf, len) = *v; - f(buf, len) - } + let v: &[u8] = unsafe { cast::transmute(*self) }; + v.as_imm_buf(f) } /** diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index baeb87e51b910..6bbf1210a3106 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -1691,7 +1691,7 @@ pub trait MutableVector<'self, T> { unsafe fn unsafe_mut_ref(&self, index: uint) -> *mut T; unsafe fn unsafe_set(&self, index: uint, val: T); - fn as_mut_buf(&self, f: &fn(*mut T, uint) -> U) -> U; + fn as_mut_buf(self, f: &fn(*mut T, uint) -> U) -> U; } impl<'self,T> MutableVector<'self, T> for &'self mut [T] { @@ -1783,12 +1783,9 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] { /// Similar to `as_imm_buf` but passing a `*mut T` #[inline] - fn as_mut_buf(&self, f: &fn(*mut T, uint) -> U) -> U { - unsafe { - let v : *(*mut T,uint) = transmute(self); - let (buf,len) = *v; - f(buf, len / sys::nonzero_size_of::()) - } + fn as_mut_buf(self, f: &fn(*mut T, uint) -> U) -> U { + let (buf, len): (*mut T, uint) = unsafe { transmute(self) }; + f(buf, len / sys::nonzero_size_of::()) } }