bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize slice::chunks_exact() and slice::chunks_exact_mut()

Browse source 
Fixes #47115
This commit is contained in:
Sebastian Dröge 2018-10-18 10:22:34 +03:00
parent 121320d523
commit b08ca2958e
5 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/liballoc/lib.rs
View file

@ -115,7 +115,6 @@
#![feature(unsize)] #![feature(unsize)]
#![feature(allocator_internals)] #![feature(allocator_internals)]
#![feature(on_unimplemented)] #![feature(on_unimplemented)]
#![feature(chunks_exact)]
#![feature(rustc_const_unstable)] #![feature(rustc_const_unstable)]
#![feature(const_vec_new)] #![feature(const_vec_new)]
#![feature(slice_partition_dedup)] #![feature(slice_partition_dedup)]

2
src/liballoc/slice.rs
View file

@ -123,7 +123,7 @@ pub use core::slice::{from_raw_parts, from_raw_parts_mut};
pub use core::slice::{from_ref, from_mut}; pub use core::slice::{from_ref, from_mut};
#[stable(feature = "slice_get_slice", since = "1.28.0")] #[stable(feature = "slice_get_slice", since = "1.28.0")]
pub use core::slice::SliceIndex; pub use core::slice::SliceIndex;
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
pub use core::slice::{ChunksExact, ChunksExactMut}; pub use core::slice::{ChunksExact, ChunksExactMut};
#[unstable(feature = "rchunks", issue = "55177")] #[unstable(feature = "rchunks", issue = "55177")]
pub use core::slice::{RChunks, RChunksMut, RChunksExact, RChunksExactMut}; pub use core::slice::{RChunks, RChunksMut, RChunksExact, RChunksExactMut};

1
src/liballoc/tests/lib.rs
View file

@ -19,7 +19,6 @@
#![feature(str_escape)] #![feature(str_escape)]
#![feature(try_reserve)] #![feature(try_reserve)]
#![feature(unboxed_closures)] #![feature(unboxed_closures)]
#![feature(chunks_exact)]
#![feature(rchunks)] #![feature(rchunks)]
#![feature(repeat_generic_slice)] #![feature(repeat_generic_slice)]

38
src/libcore/slice/mod.rs
View file

@ -713,8 +713,6 @@ impl<T> [T] {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(chunks_exact)]
///
/// let slice = ['l', 'o', 'r', 'e', 'm']; /// let slice = ['l', 'o', 'r', 'e', 'm'];
/// let mut iter = slice.chunks_exact(2); /// let mut iter = slice.chunks_exact(2);
/// assert_eq!(iter.next().unwrap(), &['l', 'o']); /// assert_eq!(iter.next().unwrap(), &['l', 'o']);
@ -725,7 +723,7 @@ impl<T> [T] {
/// ///
/// [`chunks`]: #method.chunks /// [`chunks`]: #method.chunks
/// [`rchunks_exact`]: #method.rchunks_exact /// [`rchunks_exact`]: #method.rchunks_exact
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
#[inline] #[inline]
pub fn chunks_exact(&self, chunk_size: usize) -> ChunksExact<T> { pub fn chunks_exact(&self, chunk_size: usize) -> ChunksExact<T> {
assert!(chunk_size != 0); assert!(chunk_size != 0);
@ -756,8 +754,6 @@ impl<T> [T] {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(chunks_exact)]
///
/// let v = &mut [0, 0, 0, 0, 0]; /// let v = &mut [0, 0, 0, 0, 0];
/// let mut count = 1; /// let mut count = 1;
/// ///
@ -772,7 +768,7 @@ impl<T> [T] {
/// ///
/// [`chunks_mut`]: #method.chunks_mut /// [`chunks_mut`]: #method.chunks_mut
/// [`rchunks_exact_mut`]: #method.rchunks_exact_mut /// [`rchunks_exact_mut`]: #method.rchunks_exact_mut
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
#[inline] #[inline]
pub fn chunks_exact_mut(&mut self, chunk_size: usize) -> ChunksExactMut<T> { pub fn chunks_exact_mut(&mut self, chunk_size: usize) -> ChunksExactMut<T> {
assert!(chunk_size != 0); assert!(chunk_size != 0);
@ -4022,25 +4018,25 @@ unsafe impl<'a, T> TrustedRandomAccess for ChunksMut<'a, T> {
/// [`remainder`]: ../../std/slice/struct.ChunksExact.html#method.remainder /// [`remainder`]: ../../std/slice/struct.ChunksExact.html#method.remainder
/// [slices]: ../../std/primitive.slice.html /// [slices]: ../../std/primitive.slice.html
#[derive(Debug)] #[derive(Debug)]
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
pub struct ChunksExact<'a, T:'a> { pub struct ChunksExact<'a, T:'a> {
v: &'a [T], v: &'a [T],
rem: &'a [T], rem: &'a [T],
chunk_size: usize chunk_size: usize
} }
#[unstable(feature = "chunks_exact", issue = "47115")]
impl<'a, T> ChunksExact<'a, T> { impl<'a, T> ChunksExact<'a, T> {
/// Return the remainder of the original slice that is not going to be /// Return the remainder of the original slice that is not going to be
/// returned by the iterator. The returned slice has at most `chunk_size-1` /// returned by the iterator. The returned slice has at most `chunk_size-1`
/// elements. /// elements.
#[stable(feature = "chunks_exact", since = "1.31.0")]
pub fn remainder(&self) -> &'a [T] { pub fn remainder(&self) -> &'a [T] {
self.rem self.rem
} }
} }
// FIXME(#26925) Remove in favor of `#[derive(Clone)]` // FIXME(#26925) Remove in favor of `#[derive(Clone)]`
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<T> Clone for ChunksExact<'_, T> { impl<T> Clone for ChunksExact<'_, T> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
ChunksExact { ChunksExact {
@ -4051,7 +4047,7 @@ impl<T> Clone for ChunksExact<'_, T> {
} }
} }
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<'a, T> Iterator for ChunksExact<'a, T> { impl<'a, T> Iterator for ChunksExact<'a, T> {
type Item = &'a [T]; type Item = &'a [T];
@ -4096,7 +4092,7 @@ impl<'a, T> Iterator for ChunksExact<'a, T> {
} }
} }
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<'a, T> DoubleEndedIterator for ChunksExact<'a, T> { impl<'a, T> DoubleEndedIterator for ChunksExact<'a, T> {
#[inline] #[inline]
fn next_back(&mut self) -> Option<&'a [T]> { fn next_back(&mut self) -> Option<&'a [T]> {
@ -4110,7 +4106,7 @@ impl<'a, T> DoubleEndedIterator for ChunksExact<'a, T> {
} }
} }
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<T> ExactSizeIterator for ChunksExact<'_, T> { impl<T> ExactSizeIterator for ChunksExact<'_, T> {
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.v.is_empty() self.v.is_empty()
@ -4120,11 +4116,11 @@ impl<T> ExactSizeIterator for ChunksExact<'_, T> {
#[unstable(feature = "trusted_len", issue = "37572")] #[unstable(feature = "trusted_len", issue = "37572")]
unsafe impl<T> TrustedLen for ChunksExact<'_, T> {} unsafe impl<T> TrustedLen for ChunksExact<'_, T> {}
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<T> FusedIterator for ChunksExact<'_, T> {} impl<T> FusedIterator for ChunksExact<'_, T> {}
#[doc(hidden)] #[doc(hidden)]
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
unsafe impl<'a, T> TrustedRandomAccess for ChunksExact<'a, T> { unsafe impl<'a, T> TrustedRandomAccess for ChunksExact<'a, T> {
unsafe fn get_unchecked(&mut self, i: usize) -> &'a [T] { unsafe fn get_unchecked(&mut self, i: usize) -> &'a [T] {
let start = i * self.chunk_size; let start = i * self.chunk_size;
@ -4146,24 +4142,24 @@ unsafe impl<'a, T> TrustedRandomAccess for ChunksExact<'a, T> {
/// [`into_remainder`]: ../../std/slice/struct.ChunksExactMut.html#method.into_remainder /// [`into_remainder`]: ../../std/slice/struct.ChunksExactMut.html#method.into_remainder
/// [slices]: ../../std/primitive.slice.html /// [slices]: ../../std/primitive.slice.html
#[derive(Debug)] #[derive(Debug)]
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
pub struct ChunksExactMut<'a, T:'a> { pub struct ChunksExactMut<'a, T:'a> {
v: &'a mut [T], v: &'a mut [T],
rem: &'a mut [T], rem: &'a mut [T],
chunk_size: usize chunk_size: usize
} }
#[unstable(feature = "chunks_exact", issue = "47115")]
impl<'a, T> ChunksExactMut<'a, T> { impl<'a, T> ChunksExactMut<'a, T> {
/// Return the remainder of the original slice that is not going to be /// Return the remainder of the original slice that is not going to be
/// returned by the iterator. The returned slice has at most `chunk_size-1` /// returned by the iterator. The returned slice has at most `chunk_size-1`
/// elements. /// elements.
#[stable(feature = "chunks_exact", since = "1.31.0")]
pub fn into_remainder(self) -> &'a mut [T] { pub fn into_remainder(self) -> &'a mut [T] {
self.rem self.rem
} }
} }
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<'a, T> Iterator for ChunksExactMut<'a, T> { impl<'a, T> Iterator for ChunksExactMut<'a, T> {
type Item = &'a mut [T]; type Item = &'a mut [T];
@ -4210,7 +4206,7 @@ impl<'a, T> Iterator for ChunksExactMut<'a, T> {
} }
} }
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<'a, T> DoubleEndedIterator for ChunksExactMut<'a, T> { impl<'a, T> DoubleEndedIterator for ChunksExactMut<'a, T> {
#[inline] #[inline]
fn next_back(&mut self) -> Option<&'a mut [T]> { fn next_back(&mut self) -> Option<&'a mut [T]> {
@ -4226,7 +4222,7 @@ impl<'a, T> DoubleEndedIterator for ChunksExactMut<'a, T> {
} }
} }
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<T> ExactSizeIterator for ChunksExactMut<'_, T> { impl<T> ExactSizeIterator for ChunksExactMut<'_, T> {
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.v.is_empty() self.v.is_empty()
@ -4236,11 +4232,11 @@ impl<T> ExactSizeIterator for ChunksExactMut<'_, T> {
#[unstable(feature = "trusted_len", issue = "37572")] #[unstable(feature = "trusted_len", issue = "37572")]
unsafe impl<T> TrustedLen for ChunksExactMut<'_, T> {} unsafe impl<T> TrustedLen for ChunksExactMut<'_, T> {}
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
impl<T> FusedIterator for ChunksExactMut<'_, T> {} impl<T> FusedIterator for ChunksExactMut<'_, T> {}
#[doc(hidden)] #[doc(hidden)]
#[unstable(feature = "chunks_exact", issue = "47115")] #[stable(feature = "chunks_exact", since = "1.31.0")]
unsafe impl<'a, T> TrustedRandomAccess for ChunksExactMut<'a, T> { unsafe impl<'a, T> TrustedRandomAccess for ChunksExactMut<'a, T> {
unsafe fn get_unchecked(&mut self, i: usize) -> &'a mut [T] { unsafe fn get_unchecked(&mut self, i: usize) -> &'a mut [T] {
let start = i * self.chunk_size; let start = i * self.chunk_size;

1
src/libcore/tests/lib.rs
View file

@ -34,7 +34,6 @@
#![feature(trusted_len)] #![feature(trusted_len)]
#![feature(try_from)] #![feature(try_from)]
#![feature(try_trait)] #![feature(try_trait)]
#![feature(chunks_exact)]
#![feature(rchunks)] #![feature(rchunks)]
#![feature(align_offset)] #![feature(align_offset)]
#![feature(reverse_bits)] #![feature(reverse_bits)]