Skip to content

Commit 689aef0

Browse files
nikomatsakisbrson
authored andcommitted
---
yaml --- r: 5932 b: refs/heads/master c: b13e7e0 h: refs/heads/master v: v3
1 parent 7af3a27 commit 689aef0

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 488006542984194da8ac6e9447fe25343bf10935
2+
refs/heads/master: b13e7e0f3dfa683471928f2a4500f1d592ada19d

trunk/src/lib/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os::getcwd;
33
import os_fs;
44

5-
native "rust" mod rustrt {
5+
native "c-stack-cdecl" mod rustrt {
66
fn rust_file_is_dir(path: str::sbuf) -> int;
77
}
88

trunk/src/lib/posix_fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
native "rust" mod rustrt {
2+
native "c-stack-cdecl" mod rustrt {
33
fn rust_list_files(&&path: str) -> [str];
44
}
55

trunk/src/lib/win32_fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
native "rust" mod rustrt {
3+
native "c-stack-cdecl" mod rustrt {
44
fn rust_list_files(&&path: str) -> [str];
55
fn rust_file_is_dir(&&path: str) -> int;
66
}

trunk/src/rt/rust_builtin.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,12 @@ debug_ptrcast(type_desc *from_ty,
325325
}
326326

327327
extern "C" CDECL rust_vec*
328-
rust_list_files(rust_vec **path) {
328+
rust_list_files(rust_str *path) {
329329
rust_task *task = rust_scheduler::get_task();
330330
array_list<rust_str*> strings;
331331
#if defined(__WIN32__)
332332
WIN32_FIND_DATA FindFileData;
333-
HANDLE hFind = FindFirstFile((char*)(*path)->data, &FindFileData);
333+
HANDLE hFind = FindFirstFile((char*)path->data, &FindFileData);
334334
if (hFind != INVALID_HANDLE_VALUE) {
335335
do {
336336
rust_str *str = make_str(task->kernel, FindFileData.cFileName,
@@ -341,7 +341,7 @@ rust_list_files(rust_vec **path) {
341341
FindClose(hFind);
342342
}
343343
#else
344-
DIR *dirp = opendir((char*)(*path)->data);
344+
DIR *dirp = opendir((char*)path->data);
345345
if (dirp) {
346346
struct dirent *dp;
347347
while ((dp = readdir(dirp))) {

0 commit comments

Comments
 (0)