From 0f00d9a797953b2ec6a1cb4c0d7c2a3235fb3a42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Feb 2012 17:11:21 +0100
Subject: [PATCH] Adjust fuzzer and cargo to changes in core::str API

---
 src/cargo/cargo.rs   | 4 ++--
 src/cargo/pgp.rs     | 2 +-
 src/fuzzer/fuzzer.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cargo/cargo.rs b/src/cargo/cargo.rs
index 4d67877afd8..ea5953fdf89 100644
--- a/src/cargo/cargo.rs
+++ b/src/cargo/cargo.rs
@@ -686,7 +686,7 @@ fn cmd_install(c: cargo) unsafe {
 
     if str::starts_with(target, "uuid:") {
         let uuid = rest(target, 5u);
-        alt str::index(uuid, '/') {
+        alt str::find_char(uuid, '/') {
             option::some(idx) {
                let source = str::slice(uuid, 0u, idx);
                uuid = str::slice(uuid, idx + 1u, str::len(uuid));
@@ -698,7 +698,7 @@ fn cmd_install(c: cargo) unsafe {
         }
     } else {
         let name = target;
-        alt str::index(name, '/') {
+        alt str::find_char(name, '/') {
             option::some(idx) {
                let source = str::slice(name, 0u, idx);
                name = str::slice(name, idx + 1u, str::len(name));
diff --git a/src/cargo/pgp.rs b/src/cargo/pgp.rs
index b22a225e46b..cdd31bb94f6 100644
--- a/src/cargo/pgp.rs
+++ b/src/cargo/pgp.rs
@@ -94,7 +94,7 @@ fn verify(root: str, data: str, sig: str, keyfp: str) -> bool {
     let p = gpg(["--homedir", path, "--with-fingerprint", "--verify", sig,
                  data]);
     let res = "Primary key fingerprint: " + keyfp;
-    for line in str::split_byte(p.err, '\n' as u8) {
+    for line in str::split_char(p.err, '\n') {
         if line == res {
             ret true;
         }
diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs
index 4b614d1f08b..68bdd035d9c 100644
--- a/src/fuzzer/fuzzer.rs
+++ b/src/fuzzer/fuzzer.rs
@@ -286,7 +286,7 @@ fn check_variants_T<T: copy>(
 }
 
 fn last_part(filename: str) -> str {
-  let ix = option::get(str::rindex(filename, '/'));
+  let ix = option::get(str::rfind_char(filename, '/'));
   str::slice(filename, ix + 1u, str::len(filename) - 3u)
 }
 
-- 
GitLab