diff options
| author | bors <bors@rust-lang.org> | 2015-07-29 09:57:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-29 09:57:50 +0000 |
| commit | d10ff632ceaab93410fd57de6e41adca2ef89688 (patch) | |
| tree | 5280c111c3c30981f8257e69528ff7ff3803d47f | |
| parent | 6fcf62831efcdef242f6858b47dd2a9b208b19ce (diff) | |
| parent | 73d4330ff8fd0ee0aa88739393d1ab5b46fe5e9a (diff) | |
| download | rust-d10ff632ceaab93410fd57de6e41adca2ef89688.tar.gz rust-d10ff632ceaab93410fd57de6e41adca2ef89688.zip | |
Auto merge of #27358 - bluss:split-at-mut, r=aturon
Use raw pointers to avoid aliasing violation in split_at_mut Fixes #27357
| -rw-r--r-- | src/libcore/slice.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs index 9339f232e91..f765cdc54d8 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -300,11 +300,12 @@ impl<T> SliceExt for [T] { #[inline] fn split_at_mut(&mut self, mid: usize) -> (&mut [T], &mut [T]) { + let len = self.len(); + let ptr = self.as_mut_ptr(); + assert!(mid <= len); unsafe { - let self2: &mut [T] = mem::transmute_copy(&self); - - (ops::IndexMut::index_mut(self, ops::RangeTo { end: mid } ), - ops::IndexMut::index_mut(self2, ops::RangeFrom { start: mid } )) + (from_raw_parts_mut(ptr, mid), + from_raw_parts_mut(ptr.offset(mid as isize), len - mid)) } } |
