nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-14 16:53:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: fix tests

Browse Source
This commit is contained in:
Huon Wilson 2013-06-10 23:01:45 +10:00
parent ec5a028ada
commit ead4468249
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libstd/str.rs
View File

@ -1194,8 +1194,8 @@ pub fn with_capacity(capacity: uint) -> ~str {
* The number of Unicode characters in `s` between the given indices. * The number of Unicode characters in `s` between the given indices.
*/ */
pub fn count_chars(s: &str, start: uint, end: uint) -> uint { pub fn count_chars(s: &str, start: uint, end: uint) -> uint {
assert!(is_char_boundary(s, start)); assert!(s.is_char_boundary(start));
assert!(is_char_boundary(s, end)); assert!(s.is_char_boundary(end));
let mut (i, len) = (start, 0u); let mut (i, len) = (start, 0u);
while i < end { while i < end {
let next = s.char_range_at(i).next; let next = s.char_range_at(i).next;
@ -1208,7 +1208,7 @@ pub fn count_chars(s: &str, start: uint, end: uint) -> uint {
/// Counts the number of bytes taken by the first `n` chars in `s` /// Counts the number of bytes taken by the first `n` chars in `s`
/// starting from `start`. /// starting from `start`.
pub fn count_bytes<'b>(s: &'b str, start: uint, n: uint) -> uint { pub fn count_bytes<'b>(s: &'b str, start: uint, n: uint) -> uint {
assert!(is_char_boundary(s, start)); assert!(s.is_char_boundary(start));
let mut (end, cnt) = (start, n); let mut (end, cnt) = (start, n);
let l = s.len(); let l = s.len();
while cnt > 0u { while cnt > 0u {
@ -1658,7 +1658,7 @@ pub trait StrSlice<'self> {
fn trim_right_chars(&self, chars_to_trim: &[char]) -> &'self str; fn trim_right_chars(&self, chars_to_trim: &[char]) -> &'self str;
fn to_owned(&self) -> ~str; fn to_owned(&self) -> ~str;
fn to_managed(&self) -> @str; fn to_managed(&self) -> @str;
fn is_char_boundary(s: &str, index: uint) -> bool; fn is_char_boundary(&self, index: uint) -> bool;
fn char_range_at(&self, start: uint) -> CharRange; fn char_range_at(&self, start: uint) -> CharRange;
fn char_at(&self, i: uint) -> char; fn char_at(&self, i: uint) -> char;
fn char_range_at_reverse(&self, start: uint) -> CharRange; fn char_range_at_reverse(&self, start: uint) -> CharRange;
@ -1800,8 +1800,8 @@ impl<'self> StrSlice<'self> for &'self str {
*/ */
#[inline] #[inline]
fn slice(&self, begin: uint, end: uint) -> &'self str { fn slice(&self, begin: uint, end: uint) -> &'self str {
assert!(is_char_boundary(*self, begin)); assert!(self.is_char_boundary(begin));
assert!(is_char_boundary(*self, end)); assert!(self.is_char_boundary(end));
unsafe { raw::slice_bytes(*self, begin, end) } unsafe { raw::slice_bytes(*self, begin, end) }
} }
#[inline] #[inline]
@ -2284,7 +2284,7 @@ impl<'self> Iterator<char> for StrCharIterator<'self> {
#[inline] #[inline]
fn next(&mut self) -> Option<char> { fn next(&mut self) -> Option<char> {
if self.index < self.string.len() { if self.index < self.string.len() {
let CharRange {ch, next} = char_range_at(self.string, self.index); let CharRange {ch, next} = self.string.char_range_at(self.index);
self.index = next; self.index = next;
Some(ch) Some(ch)
} else { } else {
@ -2303,7 +2303,7 @@ impl<'self> Iterator<char> for StrCharRevIterator<'self> {
#[inline] #[inline]
fn next(&mut self) -> Option<char> { fn next(&mut self) -> Option<char> {
if self.index > 0 { if self.index > 0 {
let CharRange {ch, next} = char_range_at_reverse(self.string, self.index); let CharRange {ch, next} = self.string.char_range_at_reverse(self.index);
self.index = next; self.index = next;
Some(ch) Some(ch)
} else { } else {
@ -2461,7 +2461,7 @@ mod tests {
let data = "abcabc"; let data = "abcabc";
assert_eq!(data.slice(0u, 6u).find_str("ab"), Some(0u)); assert_eq!(data.slice(0u, 6u).find_str("ab"), Some(0u));
assert_eq!(data.slice(2u, 6u).find_str("ab"), Some(3u)); assert_eq!(data.slice(2u, 6u).find_str("ab"), Some(3u - 2u));
assert!(data.slice(2u, 4u).find_str("ab").is_none()); assert!(data.slice(2u, 4u).find_str("ab").is_none());
let mut data = ~"ประเทศไทย中华Việt Nam"; let mut data = ~"ประเทศไทย中华Việt Nam";
@ -3042,10 +3042,10 @@ mod tests {
#[test] #[test]
fn test_contains_char() { fn test_contains_char() {
assert!(contains_char("abc", 'b')); assert!("abc".contains_char('b'));
assert!(contains_char("a", 'a')); assert!("a".contains_char('a'));
assert!(!contains_char("abc", 'd')); assert!(!"abc".contains_char('d'));
assert!(!contains_char("", 'a')); assert!(!"".contains_char('a'));
} }
#[test] #[test]