---

yaml
---
r: 44102
b: refs/heads/snap-stage3
c: 5c75f21
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 59bb9c2f1a85007c4b399767ecb98885e349aa2e
+refs/heads/snap-stage3: 5c75f210ba6e450fb1603b50ca0a4805f13173d7
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/etc/vim/syntax/rust.vim

@@ -14,7 +14,7 @@ syn match     rustAssert      "\<assert\(\w\)*"
 syn keyword   rustKeyword     as break
 syn keyword   rustKeyword     copy do drop else extern
 syn keyword   rustKeyword     for if impl let log
-syn keyword   rustKeyword     loop match mod move once priv pub pure
+syn keyword   rustKeyword     loop match mod once priv pub pure
 syn keyword   rustKeyword     ref return static
 syn keyword   rustKeyword     unsafe use while
 " FIXME: Scoped impl's name is also fallen in this category

branches/snap-stage3/src/rt/rust_util.h

@@ -19,6 +19,21 @@ extern struct type_desc str_body_tydesc;
 
 // Inline fn used regularly elsewhere.
 
+static inline size_t
+next_power_of_two(size_t s)
+{
+    size_t tmp = s - 1;
+    tmp |= tmp >> 1;
+    tmp |= tmp >> 2;
+    tmp |= tmp >> 4;
+    tmp |= tmp >> 8;
+    tmp |= tmp >> 16;
+#ifdef _LP64
+    tmp |= tmp >> 32;
+#endif
+    return tmp + 1;
+}
+
 // Rounds |size| to the nearest |alignment|. Invariant: |alignment| is a power
 // of two.
 template<typename T>
@@ -76,6 +91,10 @@ inline void reserve_vec_exact(rust_task* task, rust_vec_box** vpp,
     }
 }
 
+inline void reserve_vec(rust_task* task, rust_vec_box** vpp, size_t size) {
+    reserve_vec_exact(task, vpp, next_power_of_two(size));
+}
+
 typedef rust_vec_box rust_str;
 
 inline rust_str *