From 280633a7283c21c6d95a556816bfb698845c34d8 Mon Sep 17 00:00:00 2001
From: Kevin Cantu <me@kevincantu.org>
Date: Wed, 22 Feb 2012 23:26:09 -0800
Subject: [PATCH] (core::str) do some replacements

---
 src/fuzzer/fuzzer.rs | 4 ++--
 src/libcore/str.rs   | 5 +++--
 src/libstd/fs.rs     | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs
index 3b443d68a3d..d6b2cf8b0ec 100644
--- a/src/fuzzer/fuzzer.rs
+++ b/src/fuzzer/fuzzer.rs
@@ -286,8 +286,8 @@ fn check_variants_T<T: copy>(
 }
 
 fn last_part(filename: str) -> str {
-  let ix = option::get(str::rindex_chars(filename, '/'));
-  str::slice_chars(filename, ix + 1u, str::len_chars(filename) - 3u)
+  let ix = option::get(str::rindex(filename, '/'));
+  str::slice(filename, ix + 1u, str::len_bytes(filename) - 3u)
 }
 
 enum happiness { passed, cleanly_rejected(str), known_bug(str), failed(str), }
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 17975fe6581..4f315541da2 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -36,6 +36,7 @@ export
    bytes,
    chars,
    substr,
+   slice,
    slice_chars,
    split,
    split_str,
@@ -72,8 +73,8 @@ export
    index_chars,
    byte_index,
    byte_index_from,
-   //rindex,
-   rindex_chars,
+   rindex,
+   //rindex_chars,
    find_chars,
    find_bytes,
    find_from_bytes,
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index acc09fefb01..167e0f125d6 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -34,18 +34,18 @@ type path = str;
 
 fn splitDirnameBasename (pp: path) -> {dirname: str, basename: str} {
     let ii;
-    alt str::rindex_chars(pp, os_fs::path_sep) {
+    alt str::rindex(pp, os_fs::path_sep) {
         option::some(xx) { ii = xx; }
         option::none {
-            alt str::rindex_chars(pp, os_fs::alt_path_sep) {
+            alt str::rindex(pp, os_fs::alt_path_sep) {
                 option::some(xx) { ii = xx; }
                 option::none { ret {dirname: ".", basename: pp}; }
             }
         }
     }
 
-    ret {dirname: str::slice_chars(pp, 0u, ii),
-         basename: str::slice_chars(pp, ii + 1u, str::len_chars(pp))};
+    ret {dirname: str::slice(pp, 0u, ii),
+         basename: str::slice(pp, ii + 1u, str::len_bytes(pp))};
 }
 
 /*