---

yaml
---
r: 12199
b: refs/heads/master
c: c2f28e2
h: refs/heads/master
i:
  12197: 5f515a1
  12195: 1f2e08a
  12191: 06ffee1
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8774493dd33c0028ac7e543a88657d00c34e5eeb
+refs/heads/master: c2f28e231f65802d695815b6e40547b5a0e283fc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/vec.rs

@@ -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.
 

trunk/src/libstd/arena.rs

@@ -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);
         }