---

yaml
---
r: 15201
b: refs/heads/try
c: 1d25594
h: refs/heads/master
i:
  15199: 65c7ec1
v: v3

Author: pcwalton

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 5ce3d35f4170ecbf6a0efbc3cd7cdcb451c79837
+refs/heads/try: 1d25594657826bf9be14dee014913447851e76b4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/vec.rs

@@ -11,6 +11,7 @@ export reserve;
 export reserve_at_least;
 export capacity;
 export len;
+export alloc_len;
 export from_fn;
 export from_elem;
 export to_mut;
@@ -153,6 +154,13 @@ 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.
 

branches/try/src/libstd/arena.rs

@@ -30,9 +30,10 @@ impl arena for arena {
         start = (start + alignm1) & !alignm1;
         let mut end = start + n_bytes;
 
-        if end > vec::len(head.data) {
+        if end > vec::alloc_len(head.data) {
             // Allocate a new chunk.
-            let new_min_chunk_size = uint::max(n_bytes, vec::len(head.data));
+            let new_min_chunk_size = uint::max(n_bytes,
+                                               vec::alloc_len(head.data));
             head = chunk(uint::next_power_of_two(new_min_chunk_size));
             self.chunks = list::cons(head, @self.chunks);
             start = 0u;