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

stdlib: Remove the now-obsolete vec::alloc_len in favor of vec::capacity

Browse source
This commit is contained in:
Patrick Walton 2012-03-29 08:57:34 -07:00
parent 8774493dd3
commit c2f28e231f
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libcore/vec.rs
View file

@ -11,7 +11,6 @@ export reserve;
export reserve_at_least;
export capacity;
export len;
export alloc_len;
export from_fn;
export from_elem;
export to_mut;
@ -142,6 +141,7 @@ fn reserve_at_least<T>(&v: [const T], n: uint) {
#[doc = "
Returns the number of elements the vector can hold without reallocating
"]
#[inline(always)]
fn capacity<T>(&&v: [const T]) -> uint unsafe {
let repr: **unsafe::vec_repr = ::unsafe::reinterpret_cast(addr_of(v));
(**repr).alloc / sys::size_of::<T>()
@ -154,13 +154,6 @@ pure fn len<T>(&&v: [const T]) -> uint unsafe {
(**repr).fill / sys::size_of::<T>()
}
#[doc = "Returns the number of bytes allocated for this vector"]
#[inline(always)]
pure fn alloc_len<T>(&&v: [const T]) -> uint unsafe {
let repr: **unsafe::vec_repr = ::unsafe::reinterpret_cast(addr_of(v));
(**repr).alloc
}
#[doc = "
Creates and initializes an immutable vector.

4
src/libstd/arena.rs
View file

@ -25,7 +25,7 @@ impl arena for arena {
fn alloc_grow(n_bytes: uint, align: uint) -> *() {
// Allocate a new chunk.
let mut head = list::head(self.chunks);
let chunk_size = vec::alloc_len(head.data);
let chunk_size = vec::capacity(head.data);
let new_min_chunk_size = uint::max(n_bytes, chunk_size);
head = chunk(uint::next_power_of_two(new_min_chunk_size + 1u));
self.chunks = list::cons(head, @self.chunks);
@ -41,7 +41,7 @@ impl arena for arena {
let mut start = head.fill;
start = (start + alignm1) & !alignm1;
let end = start + n_bytes;
if end > vec::alloc_len(head.data) {
if end > vec::capacity(head.data) {
ret self.alloc_grow(n_bytes, align);
}