From 4fc0848a497ca24dd8626b6c409cb8ffce98001f Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 12 Aug 2011 11:02:23 -0700 Subject: [PATCH] Rename rust_list_files_ivec to rust_list_files --- src/lib/posix_fs.rs | 4 ++-- src/lib/win32_fs.rs | 4 ++-- src/rt/rust_builtin.cpp | 2 +- src/rt/rustrt.def.in | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/posix_fs.rs b/src/lib/posix_fs.rs index 9e14c5485ad..7be7c5b33a6 100644 --- a/src/lib/posix_fs.rs +++ b/src/lib/posix_fs.rs @@ -1,11 +1,11 @@ native "rust" mod rustrt { - fn rust_list_files_ivec(path: str) -> @[str]; + fn rust_list_files(path: str) -> @[str]; fn rust_dirent_filename(ent: os::libc::dirent) -> str; } fn list_dir(path: str) -> [str] { - ret *rustrt::rust_list_files_ivec(path); + ret *rustrt::rust_list_files(path); // TODO ensure this is always closed // FIXME: No idea why, but this appears to corrupt memory on OSX. I diff --git a/src/lib/win32_fs.rs b/src/lib/win32_fs.rs index 509cdaf0a43..6a8fe063251 100644 --- a/src/lib/win32_fs.rs +++ b/src/lib/win32_fs.rs @@ -1,12 +1,12 @@ native "rust" mod rustrt { - fn rust_list_files_ivec(path: str) -> @[str]; + fn rust_list_files(path: str) -> @[str]; fn rust_file_is_dir(path: str) -> int; } fn list_dir(path: str) -> [str] { - ret *rustrt::rust_list_files_ivec(path + "*"); + ret *rustrt::rust_list_files(path + "*"); } fn path_is_absolute(p: str) -> bool { diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 90e4cc2115f..4b8af7a67b6 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -443,7 +443,7 @@ rust_str* c_str_to_rust(rust_task *task, char const *str) { } extern "C" CDECL rust_box* -rust_list_files_ivec(rust_task *task, rust_str *path) { +rust_list_files(rust_task *task, rust_str *path) { array_list strings; #if defined(__WIN32__) WIN32_FIND_DATA FindFileData; diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 565c057799e..a2174e39168 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -48,7 +48,7 @@ rust_dirent_filename rust_file_is_dir rust_get_stdin rust_get_stdout -rust_list_files_ivec +rust_list_files rust_process_wait rust_ptr_eq rust_run_program