about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorKevin Cantu <me@kevincantu.org>2012-02-12 01:32:09 -0800
committerKevin Cantu <me@kevincantu.org>2012-02-12 15:30:20 -0800
commit2ba44e24d5fccfc6fe7c28a742d18e03b6acafae (patch)
tree7533e535c883aa357f83fedeb097260f0a46a8d2 /src/libstd
parent2b4f5136a52041a88fbf3a03f627e9c00869f182 (diff)
downloadrust-2ba44e24d5fccfc6fe7c28a742d18e03b6acafae.tar.gz
rust-2ba44e24d5fccfc6fe7c28a742d18e03b6acafae.zip
(core::str) rename byte_len_range -> substr_len_bytes and
rename char_len_range -> substr_len_chars
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rope.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index c329cdd3494..07ee837a9b9 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -743,7 +743,7 @@ mod node {
      */
     fn of_substr(str: @str, byte_start: uint, byte_len: uint) -> @node {
         ret of_substr_unsafer(str, byte_start, byte_len,
-                  str::char_len_range(*str, byte_start, byte_len));
+                  str::substr_len_chars(*str, byte_start, byte_len));
     }
 
     /*
@@ -795,7 +795,7 @@ mod node {
                     if i == 0u  { first_leaf_char_len }
                     else { hint_max_leaf_char_len };
                 let chunk_byte_len =
-                    str::byte_len_range(*str, offset, chunk_char_len);
+                    str::substr_len_bytes(*str, offset, chunk_char_len);
                 nodes[i] = @leaf({
                     byte_offset: offset,
                     byte_len:    chunk_byte_len,
@@ -998,7 +998,7 @@ mod node {
             alt(*node) {
               node::leaf(x) {
                 let char_len =
-                    str::char_len_range(*x.content, byte_offset, byte_len);
+                    str::substr_len_chars(*x.content, byte_offset, byte_len);
                 ret @leaf({byte_offset: byte_offset,
                                 byte_len:    byte_len,
                                 char_len:    char_len,
@@ -1059,9 +1059,9 @@ mod node {
                     ret node;
                 }
                 let byte_offset =
-                    str::byte_len_range(*x.content, 0u, char_offset);
+                    str::substr_len_bytes(*x.content, 0u, char_offset);
                 let byte_len    =
-                    str::byte_len_range(*x.content, byte_offset, char_len);
+                    str::substr_len_bytes(*x.content, byte_offset, char_len);
                 ret @leaf({byte_offset: byte_offset,
                            byte_len:    byte_len,
                            char_len:    char_len,