(core::str) mostly rename len -> len_chars

5 files changed, 18 insertions, 18 deletions

diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 30abbb1e70a..ff218846150 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -45,7 +45,7 @@ fn splitDirnameBasename (pp: path) -> {dirname: str, basename: str} {
     }
 
     ret {dirname: str::slice(pp, 0u, ii),
-         basename: str::slice(pp, ii + 1u, str::len(pp))};
+         basename: str::slice(pp, ii + 1u, str::len_chars(pp))};
 }
 
 /*
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index dba406c889e..e925cd16e33 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -79,7 +79,7 @@ A description of a possible option
 type opt = {name: name, hasarg: hasarg, occur: occur};
 
 fn mkname(nm: str) -> name {
-    ret if str::len(nm) == 1u {
+    ret if str::len_bytes(nm) == 1u {
             short(str::char_at(nm, 0u))
         } else { long(nm) };
 }
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 127cd93952e..23d70a78bf6 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -70,8 +70,8 @@ fn to_str(j: json) -> str {
 }
 
 fn rest(s: str) -> str {
-    assert(str::len(s) >= 1u);
-    str::slice(s, 1u, str::len(s))
+    assert(str::len_chars(s) >= 1u);
+    str::slice(s, 1u, str::len_chars(s))
 }
 
 fn from_str_str(s: str) -> (option<json>, str) {
@@ -99,7 +99,7 @@ fn from_str_str(s: str) -> (option<json>, str) {
             cont;
         } else if (c == '"') {
             ret (some(string(res)),
-                 str::slice(s, pos, str::len(s)));
+                 str::slice(s, pos, str::len_chars(s)));
         }
         res = res + str::from_char(c);
     }
@@ -200,12 +200,12 @@ fn from_str_float(s: str) -> (option<json>, str) {
             }
             '.' { break; }
             _ { ret (some(num(neg * res)),
-                     str::slice(s, opos, str::len(s))); }
+                     str::slice(s, opos, str::len_chars(s))); }
         }
     }
 
     if pos == len {
-        ret (some(num(neg * res)), str::slice(s, pos, str::len(s)));
+        ret (some(num(neg * res)), str::slice(s, pos, str::len_chars(s)));
     }
 
     let dec = 1f;
@@ -220,17 +220,17 @@ fn from_str_float(s: str) -> (option<json>, str) {
                 res += (((c as int) - ('0' as int)) as float) * dec;
             }
             _ { ret (some(num(neg * res)),
-                     str::slice(s, opos, str::len(s))); }
+                     str::slice(s, opos, str::len_chars(s))); }
         }
     }
-    ret (some(num(neg * res)), str::slice(s, pos, str::len(s)));
+    ret (some(num(neg * res)), str::slice(s, pos, str::len_chars(s)));
 }
 
 fn from_str_bool(s: str) -> (option<json>, str) {
     if (str::starts_with(s, "true")) {
-        (some(boolean(true)), str::slice(s, 4u, str::len(s)))
+        (some(boolean(true)), str::slice(s, 4u, str::len_chars(s)))
     } else if (str::starts_with(s, "false")) {
-        (some(boolean(false)), str::slice(s, 5u, str::len(s)))
+        (some(boolean(false)), str::slice(s, 5u, str::len_chars(s)))
     } else {
         (none, s)
     }
@@ -238,7 +238,7 @@ fn from_str_bool(s: str) -> (option<json>, str) {
 
 fn from_str_null(s: str) -> (option<json>, str) {
     if (str::starts_with(s, "null")) {
-        (some(null), str::slice(s, 4u, str::len(s)))
+        (some(null), str::slice(s, 4u, str::len_chars(s)))
     } else {
         (none, s)
     }
diff --git a/src/libstd/rand.rs b/src/libstd/rand.rs
index 35525b70710..33fac40fccc 100644
--- a/src/libstd/rand.rs
+++ b/src/libstd/rand.rs
@@ -77,7 +77,7 @@ fn mk_rng() -> rng {
             let i = 0u;
             while (i < len) {
                 let n = rustrt::rand_next(**self) as uint %
-                    str::len(charset);
+                    str::len_bytes(charset);
                 s = s + str::from_char(str::char_at(charset, n));
                 i += 1u;
             }
@@ -130,8 +130,8 @@ mod tests {
         log(debug, r.gen_str(10u));
         log(debug, r.gen_str(10u));
         log(debug, r.gen_str(10u));
-        assert(str::len(r.gen_str(10u)) == 10u);
-        assert(str::len(r.gen_str(16u)) == 16u);
+        assert(str::len_bytes(r.gen_str(10u)) == 10u);
+        assert(str::len_bytes(r.gen_str(16u)) == 16u);
     }
 }
 
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index 07ee837a9b9..3f330c3586d 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -1373,7 +1373,7 @@ mod tests {
         let sample = @"0123456789ABCDE";
         let r      = of_str(sample);
 
-        assert char_len(r) == str::len(*sample);
+        assert char_len(r) == str::len_chars(*sample);
         assert rope_to_string(r) == *sample;
     }
 
@@ -1384,7 +1384,7 @@ mod tests {
         while i < 10 { *buf = *buf + *buf; i+=1;}
         let sample = @*buf;
         let r      = of_str(sample);
-        assert char_len(r) == str::len(*sample);
+        assert char_len(r) == str::len_chars(*sample);
         assert rope_to_string(r) == *sample;
 
         let string_iter = 0u;
@@ -1427,7 +1427,7 @@ mod tests {
             }
         }
 
-        assert len == str::len(*sample);
+        assert len == str::len_chars(*sample);
     }
 
     #[test]