Skip to content

Commit e591563

Browse files
committed
---
yaml --- r: 10157 b: refs/heads/snap-stage3 c: ecd4318 h: refs/heads/master i: 10155: 3cac31b v: v3
1 parent f2b69e5 commit e591563

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 54d42c4d74bb88d7e411d5c9abf8a402fedf0049
4+
refs/heads/snap-stage3: ecd431809431b07fd63fb62c0f3ae70e2c917582
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/rust_builtin.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ debug_get_stk_seg() {
367367
return task->stk;
368368
}
369369

370-
extern "C" CDECL rust_vec*
370+
extern "C" CDECL rust_vec_box*
371371
rust_list_files(rust_str *path) {
372372
rust_task *task = rust_get_current_task();
373373
array_list<rust_str*> strings;
@@ -397,12 +397,12 @@ rust_list_files(rust_str *path) {
397397
}
398398
#endif
399399

400-
rust_vec *vec = (rust_vec *)
401-
task->kernel->malloc(vec_size<rust_vec*>(strings.size()),
400+
rust_vec_box *vec = (rust_vec_box *)
401+
task->kernel->malloc(vec_size<rust_vec_box*>(strings.size()),
402402
"list_files_vec");
403403
size_t alloc_sz = sizeof(rust_vec*) * strings.size();
404-
vec->fill = vec->alloc = alloc_sz;
405-
memcpy(&vec->data[0], strings.data(), alloc_sz);
404+
vec->body.fill = vec->body.alloc = alloc_sz;
405+
memcpy(&vec->body.data[0], strings.data(), alloc_sz);
406406
return vec;
407407
}
408408

0 commit comments

Comments
 (0)