diff --git a/src/libcore/str.rs b/src/libcore/str.rs index 227635944dd5..e8a88f3bc1b9 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -349,7 +349,7 @@ pub fn unshift_char(s: &mut ~str, ch: char) { #[inline(always)] pub pure fn byte_slice(s: &str, f: fn(v: &[u8]) -> T) -> T { do as_buf(s) |p,n| { - unsafe { vec::raw::form_slice(p, n-1u, f) } + unsafe { vec::raw::buf_as_slice(p, n-1u, f) } } } diff --git a/src/libcore/uint-template.rs b/src/libcore/uint-template.rs index eb58d17c5f11..7d0421c07301 100644 --- a/src/libcore/uint-template.rs +++ b/src/libcore/uint-template.rs @@ -226,8 +226,7 @@ fn digit(n: T) -> u8 { *ptr::mut_offset(mp, i) = '-' as u8; } - vec::raw::form_slice(ptr::offset(p, i), - len - i, f) + vec::raw::buf_as_slice(ptr::offset(p, i), len - i, f) } } } diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs index 3fdf97cf3501..ce82215a87c8 100644 --- a/src/libcore/vec.rs +++ b/src/libcore/vec.rs @@ -1741,8 +1741,9 @@ pub unsafe fn to_mut_ptr(+v: &[mut T]) -> *mut T { * not bytes). */ #[inline(always)] - pub unsafe fn form_slice(p: *T, len: uint, - f: fn(v: &[T]) -> U) -> U { + pub unsafe fn buf_as_slice(p: *T, + len: uint, + f: fn(v: &[T]) -> U) -> U { let pair = (p, len * sys::size_of::()); let v : *(&blk/[T]) = ::cast::reinterpret_cast(&addr_of(&pair)); diff --git a/src/rustc/metadata/loader.rs b/src/rustc/metadata/loader.rs index 2ccaccf17a59..0a8354be71f7 100644 --- a/src/rustc/metadata/loader.rs +++ b/src/rustc/metadata/loader.rs @@ -193,7 +193,7 @@ fn get_metadata_section(os: os, vlen); let minsz = uint::min(vlen, csz); let mut version_ok = false; - do vec::raw::form_slice(cvbuf, minsz) |buf0| { + do vec::raw::buf_as_slice(cvbuf, minsz) |buf0| { version_ok = (buf0 == encoder::metadata_encoding_version); } @@ -202,7 +202,7 @@ fn get_metadata_section(os: os, let cvbuf1 = ptr::offset(cvbuf, vlen); debug!("inflating %u bytes of compressed metadata", csz - vlen); - do vec::raw::form_slice(cvbuf1, csz-vlen) |bytes| { + do vec::raw::buf_as_slice(cvbuf1, csz-vlen) |bytes| { let inflated = flate::inflate_bytes(bytes); found = move Some(@(move inflated)); }