rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

std::str: Small fix for slice

Browse Source
This commit is contained in:
blake2-ppc
2013-08-18 13:57:34 +02:00
parent 548bdbaa29
commit 4043c70f23
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libstd/str.rs
View File

@@ -1366,8 +1366,7 @@ impl<'self> StrSlice<'self> for &'self str {
/// beyond the last character of the string /// beyond the last character of the string
#[inline] #[inline]
fn slice(&self, begin: uint, end: uint) -> &'self str { fn slice(&self, begin: uint, end: uint) -> &'self str {
assert!(self.is_char_boundary(begin)); assert!(self.is_char_boundary(begin) && self.is_char_boundary(end));
assert!(self.is_char_boundary(end));
unsafe { raw::slice_bytes(*self, begin, end) } unsafe { raw::slice_bytes(*self, begin, end) }
} }
@@ -1609,6 +1608,7 @@ impl<'self> StrSlice<'self> for &'self str {
/// Returns false if the index points into the middle of a multi-byte /// Returns false if the index points into the middle of a multi-byte
/// character sequence. /// character sequence.
#[inline]
fn is_char_boundary(&self, index: uint) -> bool { fn is_char_boundary(&self, index: uint) -> bool {
if index == self.len() { return true; } if index == self.len() { return true; }
let b = self[index]; let b = self[index];
@@ -1694,6 +1694,7 @@ impl<'self> StrSlice<'self> for &'self str {
/// This function can be used to iterate over a unicode string in reverse. /// This function can be used to iterate over a unicode string in reverse.
/// ///
/// Returns 0 for next index if called on start index 0. /// Returns 0 for next index if called on start index 0.
#[inline]
fn char_range_at_reverse(&self, start: uint) -> CharRange { fn char_range_at_reverse(&self, start: uint) -> CharRange {
let mut prev = start; let mut prev = start;