OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #30677 - diwic:master, r=bluss 

Obviously we can't remove the character one past the end of the String. And we can't today either - we'll just panic at char_at() instead - but if we're going to keep that assertion, we should at least have a correct assertion.
This commit is contained in:
bors 2016-01-03 21:00:46 +00:00
parent cae9267d47 8b398ed823
commit 8f11a9ef4e
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/libcollections/string.rs
View File

@ -1029,8 +1029,8 @@ impl String {
///
/// # Panics
///
/// Panics if `idx` is larger than the `String`'s length, or if it does not
/// lie on a [`char`] boundary.
/// Panics if `idx` is larger than or equal to the `String`'s length,
/// or if it does not lie on a [`char`] boundary.
///
/// [`char`]: ../primitive.char.html
///
@ -1049,7 +1049,7 @@ impl String {
#[stable(feature = "rust1", since = "1.0.0")]
pub fn remove(&mut self, idx: usize) -> char {
let len = self.len();
assert!(idx <= len);
assert!(idx < len);
let ch = self.char_at(idx);
let next = idx + ch.len_utf8();