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

std: simplify str::as_imm_buf and vec::as_{imm,mut}_buf

Browse source
This commit is contained in:
Erick Tryzelaar 2013-07-23 12:31:00 -07:00
parent 037a5b1af4
commit cced3c9013
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstd/str.rs
View file

@ -1957,11 +1957,8 @@ impl<'self> StrSlice<'self> for &'self str {
*/
#[inline]
fn as_imm_buf<T>(&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)
}
/**

11
src/libstd/vec.rs
View file

@ -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<U>(&self, f: &fn(*mut T, uint) -> U) -> U;
fn as_mut_buf<U>(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<U>(&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::<T>())
}
fn as_mut_buf<U>(self, f: &fn(*mut T, uint) -> U) -> U {
let (buf, len): (*mut T, uint) = unsafe { transmute(self) };
f(buf, len / sys::nonzero_size_of::<T>())
}
}