Rename str::iter_chars -> str::chars_iter
This commit is contained in:
parent
c7454f5595
commit
ebf14cb3a9
1 changed files with 6 additions and 35 deletions
|
@ -64,7 +64,6 @@ export
|
||||||
any,
|
any,
|
||||||
map,
|
map,
|
||||||
bytes_iter,
|
bytes_iter,
|
||||||
iter_chars,
|
|
||||||
chars_iter,
|
chars_iter,
|
||||||
words_iter,
|
words_iter,
|
||||||
lines_iter,
|
lines_iter,
|
||||||
|
@ -591,7 +590,7 @@ fn split_func(ss: str, sepfn: fn(cc: char)->bool) -> [str] {
|
||||||
let accum: str = "";
|
let accum: str = "";
|
||||||
let ends_with_sep: bool = false;
|
let ends_with_sep: bool = false;
|
||||||
|
|
||||||
str::iter_chars(ss, {|cc| if sepfn(cc) {
|
chars_iter(ss, {|cc| if sepfn(cc) {
|
||||||
vv += [accum];
|
vv += [accum];
|
||||||
accum = "";
|
accum = "";
|
||||||
ends_with_sep = true;
|
ends_with_sep = true;
|
||||||
|
@ -678,7 +677,7 @@ FIXME: rewrite with map
|
||||||
*/
|
*/
|
||||||
fn to_lower(s: str) -> str {
|
fn to_lower(s: str) -> str {
|
||||||
let outstr = "";
|
let outstr = "";
|
||||||
iter_chars(s) { |c|
|
chars_iter(s) { |c|
|
||||||
push_char(outstr, char::to_lower(c));
|
push_char(outstr, char::to_lower(c));
|
||||||
}
|
}
|
||||||
ret outstr;
|
ret outstr;
|
||||||
|
@ -693,7 +692,7 @@ FIXME: rewrite with map
|
||||||
*/
|
*/
|
||||||
fn to_upper(s: str) -> str {
|
fn to_upper(s: str) -> str {
|
||||||
let outstr = "";
|
let outstr = "";
|
||||||
iter_chars(s) { |c|
|
chars_iter(s) { |c|
|
||||||
push_char(outstr, char::to_upper(c));
|
push_char(outstr, char::to_upper(c));
|
||||||
}
|
}
|
||||||
ret outstr;
|
ret outstr;
|
||||||
|
@ -808,7 +807,7 @@ Apply a function to each character
|
||||||
fn map(ss: str, ff: fn(char) -> char) -> str {
|
fn map(ss: str, ff: fn(char) -> char) -> str {
|
||||||
let result = "";
|
let result = "";
|
||||||
|
|
||||||
str::iter_chars(ss, {|cc|
|
chars_iter(ss, {|cc|
|
||||||
str::push_char(result, ff(cc));
|
str::push_char(result, ff(cc));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -833,13 +832,11 @@ fn bytes_iter(ss: str, it: fn(u8)) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Function: iter_chars
|
Function: chars_iter
|
||||||
|
|
||||||
Iterate over the characters in a string
|
Iterate over the characters in a string
|
||||||
|
|
||||||
FIXME: rename to 'chars_iter'
|
|
||||||
*/
|
*/
|
||||||
fn iter_chars(s: str, it: fn(char)) {
|
fn chars_iter(s: str, it: fn(char)) {
|
||||||
let pos = 0u, len = byte_len(s);
|
let pos = 0u, len = byte_len(s);
|
||||||
while (pos < len) {
|
while (pos < len) {
|
||||||
let {ch, next} = char_range_at(s, pos);
|
let {ch, next} = char_range_at(s, pos);
|
||||||
|
@ -848,17 +845,6 @@ fn iter_chars(s: str, it: fn(char)) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
Function: chars_iter
|
|
||||||
|
|
||||||
Iterate over the characters in a string
|
|
||||||
|
|
||||||
FIXME: A synonym to iter_chars
|
|
||||||
*/
|
|
||||||
fn chars_iter(ss: str, it: fn(char)) {
|
|
||||||
iter_chars(ss, it)
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Function: words_iter
|
Function: words_iter
|
||||||
|
|
||||||
|
@ -1845,21 +1831,6 @@ mod tests {
|
||||||
assert !contains("", "a");
|
assert !contains("", "a");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_iter_chars() {
|
|
||||||
let i = 0;
|
|
||||||
iter_chars("x\u03c0y") {|ch|
|
|
||||||
alt i {
|
|
||||||
0 { assert ch == 'x'; }
|
|
||||||
1 { assert ch == '\u03c0'; }
|
|
||||||
2 { assert ch == 'y'; }
|
|
||||||
}
|
|
||||||
i += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
iter_chars("") {|_ch| fail; } // should not fail
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_chars_iter() {
|
fn test_chars_iter() {
|
||||||
let i = 0;
|
let i = 0;
|
||||||
|
|
Loading…
Reference in a new issue