about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-09-02 17:00:40 -0700
committerBrian Anderson <banderson@mozilla.com>2011-09-02 22:11:46 -0700
commit1b67d211b40b268180c3642fc8f6f09cbf0895a6 (patch)
tree10159d086cab03097aa59118d87cbcd08b2203b9 /src/rt/rust_builtin.cpp
parent01b254b411a954ebed24a38f873e02b7f6edd0a6 (diff)
downloadrust-1b67d211b40b268180c3642fc8f6f09cbf0895a6.tar.gz
rust-1b67d211b40b268180c3642fc8f6f09cbf0895a6.zip
Add a rust_str typedef to the runtime. Issue #855
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index a09e7ac1849..f8fc85a0fe1 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -7,7 +7,7 @@
 
 /* Native builtins. */
 
-extern "C" CDECL rust_vec*
+extern "C" CDECL rust_str*
 last_os_error(rust_task *task) {
     LOG(task, task, "last_os_error()");
 
@@ -40,15 +40,15 @@ last_os_error(rust_task *task) {
     }
 #endif
 
-    rust_vec * st = make_str(task->kernel, buf, strlen(buf),
-                              "last_os_error");
+    rust_str * st = make_str(task->kernel, buf, strlen(buf),
+                             "last_os_error");
 #ifdef __WIN32__
     LocalFree((HLOCAL)buf);
 #endif
     return st;
 }
 
-extern "C" CDECL rust_vec *
+extern "C" CDECL rust_str *
 rust_getcwd(rust_task *task) {
     LOG(task, task, "rust_getcwd()");
 
@@ -323,15 +323,15 @@ debug_ptrcast(rust_task *task,
 
 extern "C" CDECL rust_vec*
 rust_list_files(rust_task *task, rust_vec **path) {
-    array_list<rust_vec*> strings;
+    array_list<rust_str*> strings;
 #if defined(__WIN32__)
     WIN32_FIND_DATA FindFileData;
     HANDLE hFind = FindFirstFile((char*)(*path)->data, &FindFileData);
     if (hFind != INVALID_HANDLE_VALUE) {
         do {
-            rust_vec *str = make_str(task->kernel, FindFileData.cFileName,
-                                      strlen(FindFileData.cFileName),
-                                      "list_files_str");
+            rust_str *str = make_str(task->kernel, FindFileData.cFileName,
+                                     strlen(FindFileData.cFileName),
+                                     "list_files_str");
             strings.push(str);
         } while (FindNextFile(hFind, &FindFileData));
         FindClose(hFind);