Rename str::to_chars -> str::chars
This commit is contained in:
committed by
Brian Anderson
parent
685a434e0a
commit
c7454f5595
@@ -35,7 +35,7 @@ export
|
|||||||
|
|
||||||
// Transforming strings
|
// Transforming strings
|
||||||
bytes,
|
bytes,
|
||||||
to_chars,
|
chars,
|
||||||
substr,
|
substr,
|
||||||
char_slice,
|
char_slice,
|
||||||
slice,
|
slice,
|
||||||
@@ -341,7 +341,7 @@ fn trim_left(s: str) -> str {
|
|||||||
}
|
}
|
||||||
ret i;
|
ret i;
|
||||||
}
|
}
|
||||||
let chars = to_chars(s);
|
let chars = chars(s);
|
||||||
let whities = count_whities(chars);
|
let whities = count_whities(chars);
|
||||||
ret from_chars(vec::slice(chars, whities, vec::len(chars)));
|
ret from_chars(vec::slice(chars, whities, vec::len(chars)));
|
||||||
}
|
}
|
||||||
@@ -360,7 +360,7 @@ fn trim_right(s: str) -> str {
|
|||||||
}
|
}
|
||||||
ret i;
|
ret i;
|
||||||
}
|
}
|
||||||
let chars = to_chars(s);
|
let chars = chars(s);
|
||||||
let whities = count_whities(chars);
|
let whities = count_whities(chars);
|
||||||
ret from_chars(vec::slice(chars, 0u, whities));
|
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
|
Convert a string to a vector of characters
|
||||||
|
|
||||||
FIXME: rename to 'chars'
|
FIXME: rename to 'chars'
|
||||||
*/
|
*/
|
||||||
fn to_chars(s: str) -> [char] {
|
fn chars(s: str) -> [char] {
|
||||||
let buf: [char] = [];
|
let buf: [char] = [];
|
||||||
let i = 0u;
|
let i = 0u;
|
||||||
let len = byte_len(s);
|
let len = byte_len(s);
|
||||||
@@ -440,7 +440,7 @@ Failure:
|
|||||||
FIXME: rename to slice(), make faster by avoiding char conversion
|
FIXME: rename to slice(), make faster by avoiding char conversion
|
||||||
*/
|
*/
|
||||||
fn char_slice(s: str, begin: uint, end: uint) -> str {
|
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_() {
|
fn test_windowed_() {
|
||||||
let _x = windowed(0u, "abcd");
|
let _x = windowed(0u, "abcd");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_chars() {
|
||||||
|
let ss = "ศไทย中华Việt Nam";
|
||||||
|
assert ['ศ','ไ','ท','ย','中','华','V','i','ệ','t',' ','N','a','m']
|
||||||
|
== chars(ss);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ fn main() {
|
|||||||
|
|
||||||
assert (str::byte_len(s) == 10u);
|
assert (str::byte_len(s) == 10u);
|
||||||
assert (str::char_len(s) == 4u);
|
assert (str::char_len(s) == 4u);
|
||||||
assert (vec::len::<char>(str::to_chars(s)) == 4u);
|
assert (vec::len::<char>(str::chars(s)) == 4u);
|
||||||
assert (str::eq(str::from_chars(str::to_chars(s)), s));
|
assert (str::eq(str::from_chars(str::chars(s)), s));
|
||||||
assert (str::char_at(s, 0u) == 'e');
|
assert (str::char_at(s, 0u) == 'e');
|
||||||
assert (str::char_at(s, 1u) == 'é');
|
assert (str::char_at(s, 1u) == 'é');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user