about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-05-22 18:00:56 -0700
committerBrian Anderson <banderson@mozilla.com>2012-05-30 21:23:34 -0700
commitecd431809431b07fd63fb62c0f3ae70e2c917582 (patch)
tree97756ecff54d146d6816623fe08fb1af70d62d76 /src/rt/rust_builtin.cpp
parent54d42c4d74bb88d7e411d5c9abf8a402fedf0049 (diff)
downloadrust-ecd431809431b07fd63fb62c0f3ae70e2c917582.tar.gz
rust-ecd431809431b07fd63fb62c0f3ae70e2c917582.zip
rt: Fix rust_list_files for new vecs
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index ce86bc0901b..7b00c6e701c 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -367,7 +367,7 @@ debug_get_stk_seg() {
     return task->stk;
 }
 
-extern "C" CDECL rust_vec*
+extern "C" CDECL rust_vec_box*
 rust_list_files(rust_str *path) {
     rust_task *task = rust_get_current_task();
     array_list<rust_str*> strings;
@@ -397,12 +397,12 @@ rust_list_files(rust_str *path) {
   }
 #endif
 
-  rust_vec *vec = (rust_vec *)
-      task->kernel->malloc(vec_size<rust_vec*>(strings.size()),
+  rust_vec_box *vec = (rust_vec_box *)
+      task->kernel->malloc(vec_size<rust_vec_box*>(strings.size()),
                            "list_files_vec");
   size_t alloc_sz = sizeof(rust_vec*) * strings.size();
-  vec->fill = vec->alloc = alloc_sz;
-  memcpy(&vec->data[0], strings.data(), alloc_sz);
+  vec->body.fill = vec->body.alloc = alloc_sz;
+  memcpy(&vec->body.data[0], strings.data(), alloc_sz);
   return vec;
 }