Skip to content

Commit

Permalink
Rollup merge of rust-lang#48450 - frewsxcv:frewsxcxv-stabilize-slice-…
Browse files Browse the repository at this point in the history
…rotatee, r=alexcrichton

Stabilize [T]::rotate_{left,right}

rust-lang#41891
  • Loading branch information
kennytm committed Feb 28, 2018
2 parents 71ce38e + b1a6c8b commit ef44e63
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 23 deletions.
1 change: 0 additions & 1 deletion src/liballoc/benches/lib.rs
Expand Up @@ -13,7 +13,6 @@
#![feature(i128_type)]
#![feature(rand)]
#![feature(repr_simd)]
#![feature(slice_rotate)]
#![feature(test)]

extern crate rand;
Expand Down
1 change: 0 additions & 1 deletion src/liballoc/lib.rs
Expand Up @@ -79,7 +79,6 @@
#![cfg_attr(test, feature(placement_in))]
#![cfg_attr(not(test), feature(core_float))]
#![cfg_attr(not(test), feature(exact_size_is_empty))]
#![cfg_attr(not(test), feature(slice_rotate))]
#![cfg_attr(not(test), feature(generator_trait))]
#![cfg_attr(test, feature(rand, test))]
#![feature(allow_internal_unstable)]
Expand Down
20 changes: 3 additions & 17 deletions src/liballoc/slice.rs
Expand Up @@ -1460,8 +1460,6 @@ impl<T> [T] {
/// # Examples
///
/// ```
/// #![feature(slice_rotate)]
///
/// let mut a = ['a', 'b', 'c', 'd', 'e', 'f'];
/// a.rotate_left(2);
/// assert_eq!(a, ['c', 'd', 'e', 'f', 'a', 'b']);
Expand All @@ -1470,23 +1468,15 @@ impl<T> [T] {
/// Rotating a subslice:
///
/// ```
/// #![feature(slice_rotate)]
///
/// let mut a = ['a', 'b', 'c', 'd', 'e', 'f'];
/// a[1..5].rotate_left(1);
/// assert_eq!(a, ['a', 'c', 'd', 'e', 'b', 'f']);
/// ```
#[unstable(feature = "slice_rotate", issue = "41891")]
/// ```
#[stable(feature = "slice_rotate", since = "1.26.0")]
pub fn rotate_left(&mut self, mid: usize) {
core_slice::SliceExt::rotate_left(self, mid);
}

#[unstable(feature = "slice_rotate", issue = "41891")]
#[rustc_deprecated(since = "", reason = "renamed to `rotate_left`")]
pub fn rotate(&mut self, mid: usize) {
core_slice::SliceExt::rotate_left(self, mid);
}

/// Rotates the slice in-place such that the first `self.len() - k`
/// elements of the slice move to the end while the last `k` elements move
/// to the front. After calling `rotate_right`, the element previously at
Expand All @@ -1505,8 +1495,6 @@ impl<T> [T] {
/// # Examples
///
/// ```
/// #![feature(slice_rotate)]
///
/// let mut a = ['a', 'b', 'c', 'd', 'e', 'f'];
/// a.rotate_right(2);
/// assert_eq!(a, ['e', 'f', 'a', 'b', 'c', 'd']);
Expand All @@ -1515,13 +1503,11 @@ impl<T> [T] {
/// Rotate a subslice:
///
/// ```
/// #![feature(slice_rotate)]
///
/// let mut a = ['a', 'b', 'c', 'd', 'e', 'f'];
/// a[1..5].rotate_right(1);
/// assert_eq!(a, ['a', 'e', 'b', 'c', 'd', 'f']);
/// ```
#[unstable(feature = "slice_rotate", issue = "41891")]
#[stable(feature = "slice_rotate", since = "1.26.0")]
pub fn rotate_right(&mut self, k: usize) {
core_slice::SliceExt::rotate_right(self, k);
}
Expand Down
1 change: 0 additions & 1 deletion src/liballoc/tests/lib.rs
Expand Up @@ -23,7 +23,6 @@
#![feature(pattern)]
#![feature(placement_in_syntax)]
#![feature(rand)]
#![feature(slice_rotate)]
#![feature(splice)]
#![feature(str_escape)]
#![feature(string_retain)]
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/slice/mod.rs
Expand Up @@ -211,10 +211,10 @@ 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")]
#[stable(feature = "slice_rotate", since = "1.26.0")]
fn rotate_left(&mut self, mid: usize);

#[unstable(feature = "slice_rotate", issue = "41891")]
#[stable(feature = "slice_rotate", since = "1.26.0")]
fn rotate_right(&mut self, k: usize);

#[stable(feature = "clone_from_slice", since = "1.7.0")]
Expand Down
1 change: 0 additions & 1 deletion src/libcore/tests/lib.rs
Expand Up @@ -37,7 +37,6 @@
#![feature(refcell_replace_swap)]
#![feature(sip_hash_13)]
#![feature(slice_patterns)]
#![feature(slice_rotate)]
#![feature(sort_internals)]
#![feature(specialization)]
#![feature(step_trait)]
Expand Down

0 comments on commit ef44e63

Please sign in to comment.