nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix byte_len in char_len_range to be what it is advertised.

Browse Source
This commit is contained in:
Kevin Atkinson 2012-01-24 22:57:51 -07:00 committed by Graydon Hoare
parent 33f4a98388
commit e127bf680f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcore/str.rs
View File

@ -1066,15 +1066,15 @@ Safety note:
FIXME: rename to 'substr_len_chars' FIXME: rename to 'substr_len_chars'
*/ */
fn char_len_range(s: str, byte_start: uint, byte_len: uint) -> uint { fn char_len_range(s: str, byte_start: uint, byte_len: uint) -> uint {
let i = byte_start; let i = byte_start;
let byte_stop = i + byte_len;
let len = 0u; let len = 0u;
while i < byte_len { while i < byte_stop {
let chsize = utf8_char_width(s[i]); let chsize = utf8_char_width(s[i]);
assert (chsize > 0u); assert (chsize > 0u);
len += 1u; len += 1u;
i += chsize; i += chsize;
} }
assert (i == byte_len);
ret len; ret len;
} }