Skip to content

Commit

Permalink
Auto merge of #30677 - diwic:master, r=bluss
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Jan 3, 2016
2 parents cae9267 + 8b398ed commit 8f11a9e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libcollections/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
///
Expand All @@ -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();
Expand Down

0 comments on commit 8f11a9e

Please sign in to comment.