diff options
| author | bors <bors@rust-lang.org> | 2020-10-18 18:50:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-18 18:50:43 +0000 |
| commit | 187b8771dca797ccac6b5c8a87db1c3afd11172e (patch) | |
| tree | 92b7e614a381aa8b4acb97723500e364162ed1f1 /library/alloc/src/string.rs | |
| parent | 4d247ad7d3d2a9f72cd60e281f39b5d85bd6a463 (diff) | |
| parent | f055b0bb0847ecf08fe452a270faae8324b55b05 (diff) | |
| download | rust-187b8771dca797ccac6b5c8a87db1c3afd11172e.tar.gz rust-187b8771dca797ccac6b5c8a87db1c3afd11172e.zip | |
Auto merge of #76885 - dylni:move-slice-check-range-to-range-bounds, r=KodrAus
Move `slice::check_range` to `RangeBounds` Since this method doesn't take a slice anymore (#76662), it makes more sense to define it on `RangeBounds`. Questions: - Should the new method be `assert_len` or `assert_length`?
Diffstat (limited to 'library/alloc/src/string.rs')
| -rw-r--r-- | library/alloc/src/string.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/library/alloc/src/string.rs b/library/alloc/src/string.rs index dc67d903a1d..1bec9e0ff26 100644 --- a/library/alloc/src/string.rs +++ b/library/alloc/src/string.rs @@ -49,7 +49,6 @@ use core::iter::{FromIterator, FusedIterator}; use core::ops::Bound::{Excluded, Included, Unbounded}; use core::ops::{self, Add, AddAssign, Index, IndexMut, Range, RangeBounds}; use core::ptr; -use core::slice; use core::str::{lossy, pattern::Pattern}; use crate::borrow::{Cow, ToOwned}; @@ -1507,14 +1506,14 @@ impl String { // of the vector version. The data is just plain bytes. // Because the range removal happens in Drop, if the Drain iterator is leaked, // the removal will not happen. - let Range { start, end } = slice::check_range(self.len(), range); + let Range { start, end } = range.assert_len(self.len()); assert!(self.is_char_boundary(start)); assert!(self.is_char_boundary(end)); // Take out two simultaneous borrows. The &mut String won't be accessed // until iteration is over, in Drop. let self_ptr = self as *mut _; - // SAFETY: `check_range` and `is_char_boundary` do the appropriate bounds checks. + // SAFETY: `assert_len` and `is_char_boundary` do the appropriate bounds checks. let chars_iter = unsafe { self.get_unchecked(start..end) }.chars(); Drain { start, end, iter: chars_iter, string: self_ptr } |
