diff options
| author | bors <bors@rust-lang.org> | 2017-06-02 07:51:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-02 07:51:20 +0000 |
| commit | 558cd1e393188a07bda413931aa88e82996d31c2 (patch) | |
| tree | df39e7df3d1c99a395fe7b1d90751853da09d0c0 /src/libcore/slice | |
| parent | 668e698bbaacfeacb712512a58db1bd5e78ee371 (diff) | |
| parent | 094d61f079e5f06930e002da18f92dde5827154f (diff) | |
| download | rust-558cd1e393188a07bda413931aa88e82996d31c2.tar.gz rust-558cd1e393188a07bda413931aa88e82996d31c2.zip | |
Auto merge of #41670 - scottmcm:slice-rotate, r=alexcrichton
Add an in-place rotate method for slices to libcore A helpful primitive for moving chunks of data around inside a slice. For example, if you have a range selected and are drag-and-dropping it somewhere else (Example from [Sean Parent's talk](https://youtu.be/qH6sSOr-yk8?t=560)). (If this should be an RFC instead of a PR, please let me know.) Edit: changed example
Diffstat (limited to 'src/libcore/slice')
| -rw-r--r-- | src/libcore/slice/mod.rs | 14 | ||||
| -rw-r--r-- | src/libcore/slice/rotate.rs | 112 |
2 files changed, 126 insertions, 0 deletions
diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs index cef3682fd94..b13e19c0306 100644 --- a/src/libcore/slice/mod.rs +++ b/src/libcore/slice/mod.rs @@ -51,6 +51,7 @@ use mem; use marker::{Copy, Send, Sync, Sized, self}; use iter_private::TrustedRandomAccess; +mod rotate; mod sort; #[repr(C)] @@ -202,6 +203,9 @@ pub trait SliceExt { #[stable(feature = "core", since = "1.6.0")] fn ends_with(&self, needle: &[Self::Item]) -> bool where Self::Item: PartialEq; + #[unstable(feature = "slice_rotate", issue = "41891")] + fn rotate(&mut self, mid: usize); + #[stable(feature = "clone_from_slice", since = "1.7.0")] fn clone_from_slice(&mut self, src: &[Self::Item]) where Self::Item: Clone; @@ -635,6 +639,16 @@ impl<T> SliceExt for [T] { self.binary_search_by(|p| p.borrow().cmp(x)) } + fn rotate(&mut self, mid: usize) { + assert!(mid <= self.len()); + let k = self.len() - mid; + + unsafe { + let p = self.as_mut_ptr(); + rotate::ptr_rotate(mid, p.offset(mid as isize), k); + } + } + #[inline] fn clone_from_slice(&mut self, src: &[T]) where T: Clone { assert!(self.len() == src.len(), diff --git a/src/libcore/slice/rotate.rs b/src/libcore/slice/rotate.rs new file mode 100644 index 00000000000..3b9ae5652c5 --- /dev/null +++ b/src/libcore/slice/rotate.rs @@ -0,0 +1,112 @@ +// Copyright 2012-2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use cmp; +use mem; +use ptr; + +/// Rotation is much faster if it has access to a little bit of memory. This +/// union provides a RawVec-like interface, but to a fixed-size stack buffer. +#[allow(unions_with_drop_fields)] +union RawArray<T> { + /// Ensure this is appropriately aligned for T, and is big + /// enough for two elements even if T is enormous. + typed: [T; 2], + /// For normally-sized types, especially things like u8, having more + /// than 2 in the buffer is necessary for usefulness, so pad it out + /// enough to be helpful, but not so big as to risk overflow. + _extra: [usize; 32], +} + +impl<T> RawArray<T> { + fn new() -> Self { + unsafe { mem::uninitialized() } + } + fn ptr(&self) -> *mut T { + unsafe { &self.typed as *const T as *mut T } + } + fn cap() -> usize { + if mem::size_of::<T>() == 0 { + usize::max_value() + } else { + mem::size_of::<Self>() / mem::size_of::<T>() + } + } +} + +/// Rotates the range `[mid-left, mid+right)` such that the element at `mid` +/// becomes the first element. Equivalently, rotates the range `left` +/// elements to the left or `right` elements to the right. +/// +/// # Safety +/// +/// The specified range must be valid for reading and writing. +/// The type `T` must have non-zero size. +/// +/// # Algorithm +/// +/// For longer rotations, swap the left-most `delta = min(left, right)` +/// elements with the right-most `delta` elements. LLVM vectorizes this, +/// which is profitable as we only reach this step for a "large enough" +/// rotation. Doing this puts `delta` elements on the larger side into the +/// correct position, leaving a smaller rotate problem. Demonstration: +/// +/// ```text +/// [ 6 7 8 9 10 11 12 13 . 1 2 3 4 5 ] +/// 1 2 3 4 5 [ 11 12 13 . 6 7 8 9 10 ] +/// 1 2 3 4 5 [ 8 9 10 . 6 7 ] 11 12 13 +/// 1 2 3 4 5 6 7 [ 10 . 8 9 ] 11 12 13 +/// 1 2 3 4 5 6 7 [ 9 . 8 ] 10 11 12 13 +/// 1 2 3 4 5 6 7 8 [ . ] 9 10 11 12 13 +/// ``` +/// +/// Once the rotation is small enough, copy some elements into a stack +/// buffer, `memmove` the others, and move the ones back from the buffer. +pub unsafe fn ptr_rotate<T>(mut left: usize, mid: *mut T, mut right: usize) { + loop { + let delta = cmp::min(left, right); + if delta <= RawArray::<T>::cap() { + break; + } + + ptr_swap_n( + mid.offset(-(left as isize)), + mid.offset((right-delta) as isize), + delta); + + if left <= right { + right -= delta; + } else { + left -= delta; + } + } + + let rawarray = RawArray::new(); + let buf = rawarray.ptr(); + + let dim = mid.offset(-(left as isize)).offset(right as isize); + if left <= right { + ptr::copy_nonoverlapping(mid.offset(-(left as isize)), buf, left); + ptr::copy(mid, mid.offset(-(left as isize)), right); + ptr::copy_nonoverlapping(buf, dim, left); + } + else { + ptr::copy_nonoverlapping(mid, buf, right); + ptr::copy(mid.offset(-(left as isize)), dim, left); + ptr::copy_nonoverlapping(buf, mid.offset(-(left as isize)), right); + } +} + +unsafe fn ptr_swap_n<T>(a: *mut T, b: *mut T, n: usize) { + for i in 0..n { + // These are nonoverlapping, so use mem::swap instead of ptr::swap + mem::swap(&mut *a.offset(i as isize), &mut *b.offset(i as isize)); + } +} |
