Skip to content

Commit 16223e4

Browse files
committed
new implementation for nth_back for chunks
1 parent aff83c8 commit 16223e4

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

src/libcore/slice/mod.rs

+22-5
Original file line numberDiff line numberDiff line change
@@ -4155,15 +4155,32 @@ impl<'a, T> DoubleEndedIterator for Chunks<'a, T> {
41554155

41564156
#[inline]
41574157
fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
4158-
let (end, overflow) = self.v.len().overflowing_sub(n * self.chunk_size);
4158+
let remainder = match self.v.len().checked_rem(self.chunk_size) {
4159+
Some(res) => res,
4160+
None => 0,
4161+
};
4162+
4163+
let sub_chunk_size = if remainder != 0 { remainder } else { self.chunk_size };
4164+
4165+
let safe_sub = match n.checked_mul(sub_chunk_size) {
4166+
Some(res) => res,
4167+
None => 0,
4168+
};
4169+
4170+
let (end, overflow) = self.v.len().overflowing_sub(safe_sub);
41594171
if overflow {
4160-
self.v = &mut [];
4172+
self.v= &[];
41614173
None
41624174
} else {
4163-
let start = match end.checked_sub(self.chunk_size) {
4164-
Some(res) => cmp::min(self.v.len(), res),
4165-
None => 0,
4175+
let start = if n == 0 {
4176+
self.v.len() - sub_chunk_size
4177+
} else {
4178+
match end.checked_sub(self.chunk_size) {
4179+
Some(res) => res,
4180+
None => 0,
4181+
}
41664182
};
4183+
41674184
let nth_back = &self.v[start..end];
41684185
self.v = &self.v[..start];
41694186
Some(nth_back)

src/libcore/tests/slice.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,18 @@ fn test_chunks_nth_back() {
144144

145145
let v2: &[i32] = &[0, 1, 2, 3, 4];
146146
let mut c2 = v2.chunks(3);
147-
assert_eq!(c2.nth_back(1).unwrap(), &[0, 1]);
147+
assert_eq!(c2.nth_back(1).unwrap(), &[0, 1, 2]);
148148
assert_eq!(c2.next(), None);
149149
assert_eq!(c2.next_back(), None);
150150

151151
let v3: &[i32] = &[0, 1, 2, 3, 4];
152152
let mut c3 = v3.chunks(10);
153153
assert_eq!(c3.nth_back(0).unwrap(), &[0, 1, 2, 3, 4]);
154154
assert_eq!(c3.next(), None);
155+
156+
let v4: &[i32] = &[0, 1, 2];
157+
let mut c4 = v4.chunks(10);
158+
assert_eq!(c4.nth_back(1_000_000_000usize), None);
155159
}
156160

157161
#[test]

0 commit comments

Comments
 (0)