From 01b254b411a954ebed24a38f873e02b7f6edd0a6 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 2 Sep 2011 16:56:07 -0700 Subject: Rename istr-stuff to str in the runtime. Issue #855 --- src/rt/rust_builtin.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/rt/rust_builtin.cpp') diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 0ed30a8cbf6..a09e7ac1849 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -40,7 +40,7 @@ last_os_error(rust_task *task) { } #endif - rust_vec * st = make_istr(task->kernel, buf, strlen(buf), + rust_vec * st = make_str(task->kernel, buf, strlen(buf), "last_os_error"); #ifdef __WIN32__ LocalFree((HLOCAL)buf); @@ -63,7 +63,7 @@ rust_getcwd(rust_task *task) { return NULL; } - return make_istr(task->kernel, cbuf, strlen(cbuf), "rust_str(getcwd"); + return make_str(task->kernel, cbuf, strlen(cbuf), "rust_str(getcwd"); } extern "C" CDECL @@ -127,7 +127,7 @@ vec_from_buf_shared(rust_task *task, type_desc *ty, } extern "C" CDECL void -rust_istr_push(rust_task* task, rust_vec** sp, uint8_t byte) { +rust_str_push(rust_task* task, rust_vec** sp, uint8_t byte) { size_t fill = (*sp)->fill; reserve_vec(task, sp, fill + 1); (*sp)->data[fill-1] = byte; @@ -329,7 +329,7 @@ rust_list_files(rust_task *task, rust_vec **path) { HANDLE hFind = FindFirstFile((char*)(*path)->data, &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { do { - rust_vec *str = make_istr(task->kernel, FindFileData.cFileName, + rust_vec *str = make_str(task->kernel, FindFileData.cFileName, strlen(FindFileData.cFileName), "list_files_str"); strings.push(str); @@ -341,7 +341,7 @@ rust_list_files(rust_task *task, rust_vec **path) { if (dirp) { struct dirent *dp; while ((dp = readdir(dirp))) { - rust_vec *str = make_istr(task->kernel, dp->d_name, + rust_vec *str = make_str(task->kernel, dp->d_name, strlen(dp->d_name), "list_files_str"); strings.push(str); -- cgit 1.4.1-3-g733a5