---

yaml
---
r: 14444
b: refs/heads/try
c: 280633a
h: refs/heads/master
v: v3

Author: killerswan

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 2756a61e3442c378d10cf4e3bee3d35392623cec
+refs/heads/try: 280633a7283c21c6d95a556816bfb698845c34d8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/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), }

branches/try/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,

branches/try/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))};
 }
 
 /*