Skip to content

Commit 8fc3088

Browse files
ericktnikomatsakis
authored andcommitted
rename vec::raw::form_slice to buf_as_slice
This matches the str::raw function.
1 parent 81423a3 commit 8fc3088

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/libcore/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ pub pure fn to_bytes(s: &str) -> ~[u8] unsafe {
349349
#[inline(always)]
350350
pub pure fn byte_slice<T>(s: &str, f: fn(v: &[u8]) -> T) -> T {
351351
do as_buf(s) |p,n| {
352-
unsafe { vec::raw::form_slice(p, n-1u, f) }
352+
unsafe { vec::raw::buf_as_slice(p, n-1u, f) }
353353
}
354354
}
355355

src/libcore/uint-template.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,7 @@ pub pure fn to_str_bytes<U>(neg: bool, num: T, radix: uint,
226226
*ptr::mut_offset(mp, i) = '-' as u8;
227227
}
228228

229-
vec::raw::form_slice(ptr::offset(p, i),
230-
len - i, f)
229+
vec::raw::buf_as_slice(ptr::offset(p, i), len - i, f)
231230
}
232231
}
233232
}

src/libcore/vec.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,8 +1741,9 @@ pub mod raw {
17411741
* not bytes).
17421742
*/
17431743
#[inline(always)]
1744-
pub unsafe fn form_slice<T,U>(p: *T, len: uint,
1745-
f: fn(v: &[T]) -> U) -> U {
1744+
pub unsafe fn buf_as_slice<T,U>(p: *T,
1745+
len: uint,
1746+
f: fn(v: &[T]) -> U) -> U {
17461747
let pair = (p, len * sys::size_of::<T>());
17471748
let v : *(&blk/[T]) =
17481749
::cast::reinterpret_cast(&addr_of(&pair));

src/rustc/metadata/loader.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ fn get_metadata_section(os: os,
193193
vlen);
194194
let minsz = uint::min(vlen, csz);
195195
let mut version_ok = false;
196-
do vec::raw::form_slice(cvbuf, minsz) |buf0| {
196+
do vec::raw::buf_as_slice(cvbuf, minsz) |buf0| {
197197
version_ok = (buf0 ==
198198
encoder::metadata_encoding_version);
199199
}
@@ -202,7 +202,7 @@ fn get_metadata_section(os: os,
202202
let cvbuf1 = ptr::offset(cvbuf, vlen);
203203
debug!("inflating %u bytes of compressed metadata",
204204
csz - vlen);
205-
do vec::raw::form_slice(cvbuf1, csz-vlen) |bytes| {
205+
do vec::raw::buf_as_slice(cvbuf1, csz-vlen) |bytes| {
206206
let inflated = flate::inflate_bytes(bytes);
207207
found = move Some(@(move inflated));
208208
}

0 commit comments

Comments
 (0)