---

yaml
---
r: 13934
b: refs/heads/try
c: c7454f5
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: 685a434e0a4b432125feda745e4c4d034dc74245
+refs/heads/try: c7454f55959584579dc982d38c8432e84c7f8900
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/str.rs

@@ -35,7 +35,7 @@ export
 
    // Transforming strings
    bytes,
-   to_chars,
+   chars,
    substr,
    char_slice,
    slice,
@@ -341,7 +341,7 @@ fn trim_left(s: str) -> str {
         }
         ret i;
     }
-    let chars = to_chars(s);
+    let chars = chars(s);
     let whities = count_whities(chars);
     ret from_chars(vec::slice(chars, whities, vec::len(chars)));
 }
@@ -360,7 +360,7 @@ fn trim_right(s: str) -> str {
         }
         ret i;
     }
-    let chars = to_chars(s);
+    let chars = chars(s);
     let whities = count_whities(chars);
     ret from_chars(vec::slice(chars, 0u, whities));
 }
@@ -391,13 +391,13 @@ fn bytes(s: str) -> [u8] unsafe {
 }
 
 /*
-Function: to_chars
+Function: chars
 
 Convert a string to a vector of characters
 
 FIXME: rename to 'chars'
 */
-fn to_chars(s: str) -> [char] {
+fn chars(s: str) -> [char] {
     let buf: [char] = [];
     let i = 0u;
     let len = byte_len(s);
@@ -440,7 +440,7 @@ Failure:
 FIXME: rename to slice(), make faster by avoiding char conversion
 */
 fn char_slice(s: str, begin: uint, end: uint) -> str {
-    from_chars(vec::slice(to_chars(s), begin, end))
+    from_chars(vec::slice(chars(s), begin, end))
 }
 
 /*
@@ -1978,4 +1978,11 @@ mod tests {
     fn test_windowed_() {
         let _x = windowed(0u, "abcd");
     }
+
+    #[test]
+    fn test_chars() {
+        let ss = "ศไทย中华Việt Nam";
+        assert ['ศ','ไ','ท','ย','中','华','V','i','ệ','t',' ','N','a','m']
+            == chars(ss);
+    }
 }

branches/try/src/test/run-pass/utf8_chars.rs

@@ -9,8 +9,8 @@ fn main() {
 
     assert (str::byte_len(s) == 10u);
     assert (str::char_len(s) == 4u);
-    assert (vec::len::<char>(str::to_chars(s)) == 4u);
-    assert (str::eq(str::from_chars(str::to_chars(s)), s));
+    assert (vec::len::<char>(str::chars(s)) == 4u);
+    assert (str::eq(str::from_chars(str::chars(s)), s));
     assert (str::char_at(s, 0u) == 'e');
     assert (str::char_at(s, 1u) == 'é');