(core::str) comments and cleanup

This commit is contained in:
Kevin Cantu 2012-02-12 06:26:07 -08:00
parent faa513b1f6
commit f5e1108fc3

View file

@ -889,7 +889,7 @@ Returns:
The index of the first occurance of `needle`, or -1 if not found. The index of the first occurance of `needle`, or -1 if not found.
FIXME: UTF-8 FIXME: return an option<char position uint> instead
*/ */
fn find(haystack: str, needle: str) -> int { fn find(haystack: str, needle: str) -> int {
let haystack_len: int = len_bytes(haystack) as int; let haystack_len: int = len_bytes(haystack) as int;
@ -1003,7 +1003,6 @@ fn is_whitespace(s: str) -> bool {
// Function: len_bytes // Function: len_bytes
// //
// Returns the string length in bytes // Returns the string length in bytes
// (Synonym: byte_len)
pure fn len_bytes(s: str) -> uint unsafe { pure fn len_bytes(s: str) -> uint unsafe {
as_bytes(s) { |v| as_bytes(s) { |v|
let vlen = vec::len(v); let vlen = vec::len(v);
@ -1013,22 +1012,16 @@ pure fn len_bytes(s: str) -> uint unsafe {
} }
} }
// FIXME: remove
pure fn byte_len(s: str) -> uint unsafe { len_bytes(s) }
// Function: len // Function: len
// //
// String length or size in characters. // String length or size in characters.
// (Synonyms: len_chars, char_len) // (Synonym: len_chars)
fn len(s: str) -> uint { fn len(s: str) -> uint {
substr_len_chars(s, 0u, len_bytes(s)) substr_len_chars(s, 0u, len_bytes(s))
} }
fn len_chars(s: str) -> uint { len(s) } fn len_chars(s: str) -> uint { len(s) }
// FIXME: remove
fn char_len(s: str) -> uint { len(s) }
/* /*
Section: Misc Section: Misc
*/ */