From 8561f7654cdf86d2d48d4c0fcf6f9a1bb5f117f0 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 12 Aug 2011 11:01:05 -0700 Subject: [PATCH] Remove rust_list_files from std and rt --- src/lib/posix_fs.rs | 1 - src/lib/win32_fs.rs | 1 - src/rt/rust_builtin.cpp | 25 ------------------------- src/rt/rustrt.def.in | 1 - 4 files changed, 28 deletions(-) diff --git a/src/lib/posix_fs.rs b/src/lib/posix_fs.rs index 443a275ab1e..9e14c5485ad 100644 --- a/src/lib/posix_fs.rs +++ b/src/lib/posix_fs.rs @@ -1,6 +1,5 @@ native "rust" mod rustrt { - fn rust_list_files(path: str) -> vec[str]; fn rust_list_files_ivec(path: str) -> @[str]; fn rust_dirent_filename(ent: os::libc::dirent) -> str; } diff --git a/src/lib/win32_fs.rs b/src/lib/win32_fs.rs index cd300941df0..509cdaf0a43 100644 --- a/src/lib/win32_fs.rs +++ b/src/lib/win32_fs.rs @@ -1,7 +1,6 @@ native "rust" mod rustrt { - fn rust_list_files(path: str) -> vec[str]; fn rust_list_files_ivec(path: str) -> @[str]; fn rust_file_is_dir(path: str) -> int; } diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index c9688f3cadb..90e4cc2115f 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -442,31 +442,6 @@ rust_str* c_str_to_rust(rust_task *task, char const *str) { return vec_alloc_with_data(task, len, len, 1, (void*)str); } -extern "C" CDECL rust_vec* -rust_list_files(rust_task *task, rust_str *path) { - array_list strings; -#if defined(__WIN32__) - WIN32_FIND_DATA FindFileData; - HANDLE hFind = FindFirstFile((char*)path->data, &FindFileData); - if (hFind != INVALID_HANDLE_VALUE) { - do { - strings.push(c_str_to_rust(task, FindFileData.cFileName)); - } while (FindNextFile(hFind, &FindFileData)); - FindClose(hFind); - } -#else - DIR *dirp = opendir((char*)path->data); - if (dirp) { - struct dirent *dp; - while ((dp = readdir(dirp))) - strings.push(c_str_to_rust(task, dp->d_name)); - closedir(dirp); - } -#endif - return vec_alloc_with_data(task, strings.size(), strings.size(), - sizeof(rust_str*), strings.data()); -} - extern "C" CDECL rust_box* rust_list_files_ivec(rust_task *task, rust_str *path) { array_list strings; diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 2c0f98c3462..565c057799e 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -48,7 +48,6 @@ rust_dirent_filename rust_file_is_dir rust_get_stdin rust_get_stdout -rust_list_files rust_list_files_ivec rust_process_wait rust_ptr_eq