From 3f29e2b495a6b875af835f1fff64256e2d58d2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 3 Jan 2018 12:26:55 +0200 Subject: [PATCH] Fix compilation of TrustedRandomAccess impl for slice::Chunks https://github.com/rust-lang/rust/pull/47113 renamed the private size field to chunk_size for consistency. --- src/libcore/slice/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs index ebb166059313..9b8334167f55 100644 --- a/src/libcore/slice/mod.rs +++ b/src/libcore/slice/mod.rs @@ -2239,8 +2239,8 @@ impl<'a, T> FusedIterator for Chunks<'a, T> {} #[doc(hidden)] unsafe impl<'a, T> TrustedRandomAccess for Chunks<'a, T> { unsafe fn get_unchecked(&mut self, i: usize) -> &'a [T] { - let start = i * self.size; - let end = cmp::min(start + self.size, self.v.len()); + let start = i * self.chunk_size; + let end = cmp::min(start + self.chunk_size, self.v.len()); from_raw_parts(self.v.as_ptr().offset(start as isize), end - start) } fn may_have_side_effect() -> bool { false }