Introduce as_mut_slice
method on std::vec::IntoIter
struct.
This commit is contained in:
parent
d099e30e48
commit
01a766e521
@ -1446,13 +1446,12 @@ impl<T> IntoIterator for Vec<T> {
|
|||||||
#[inline]
|
#[inline]
|
||||||
fn into_iter(mut self) -> IntoIter<T> {
|
fn into_iter(mut self) -> IntoIter<T> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let ptr = self.as_mut_ptr();
|
let begin = self.as_mut_ptr();
|
||||||
assume(!ptr.is_null());
|
assume(!begin.is_null());
|
||||||
let begin = ptr as *const T;
|
|
||||||
let end = if mem::size_of::<T>() == 0 {
|
let end = if mem::size_of::<T>() == 0 {
|
||||||
arith_offset(ptr as *const i8, self.len() as isize) as *const T
|
arith_offset(begin as *const i8, self.len() as isize) as *const T
|
||||||
} else {
|
} else {
|
||||||
ptr.offset(self.len() as isize) as *const T
|
begin.offset(self.len() as isize) as *const T
|
||||||
};
|
};
|
||||||
let buf = ptr::read(&self.buf);
|
let buf = ptr::read(&self.buf);
|
||||||
mem::forget(self);
|
mem::forget(self);
|
||||||
@ -1710,7 +1709,7 @@ impl<'a, T> FromIterator<T> for Cow<'a, [T]> where T: Clone {
|
|||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
pub struct IntoIter<T> {
|
pub struct IntoIter<T> {
|
||||||
_buf: RawVec<T>,
|
_buf: RawVec<T>,
|
||||||
ptr: *const T,
|
ptr: *mut T,
|
||||||
end: *const T,
|
end: *const T,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1733,6 +1732,27 @@ impl<T> IntoIter<T> {
|
|||||||
slice::from_raw_parts(self.ptr, self.len())
|
slice::from_raw_parts(self.ptr, self.len())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns the remaining items of this iterator as a mutable slice.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```rust
|
||||||
|
/// # #![feature(vec_into_iter_as_slice)]
|
||||||
|
/// let vec = vec!['a', 'b', 'c'];
|
||||||
|
/// let mut into_iter = vec.into_iter();
|
||||||
|
/// assert_eq!(into_iter.as_slice(), &['a', 'b', 'c']);
|
||||||
|
/// into_iter.as_mut_slice()[2] = 'z';
|
||||||
|
/// assert_eq!(into_iter.next().unwrap(), 'a');
|
||||||
|
/// assert_eq!(into_iter.next().unwrap(), 'b');
|
||||||
|
/// assert_eq!(into_iter.next().unwrap(), 'z');
|
||||||
|
/// ```
|
||||||
|
#[unstable(feature = "vec_into_iter_as_slice", issue = "35601")]
|
||||||
|
pub fn as_mut_slice(&self) -> &mut [T] {
|
||||||
|
unsafe {
|
||||||
|
slice::from_raw_parts_mut(self.ptr, self.len())
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
@ -1747,14 +1767,14 @@ impl<T> Iterator for IntoIter<T> {
|
|||||||
#[inline]
|
#[inline]
|
||||||
fn next(&mut self) -> Option<T> {
|
fn next(&mut self) -> Option<T> {
|
||||||
unsafe {
|
unsafe {
|
||||||
if self.ptr == self.end {
|
if self.ptr as *const _ == self.end {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
if mem::size_of::<T>() == 0 {
|
if mem::size_of::<T>() == 0 {
|
||||||
// purposefully don't use 'ptr.offset' because for
|
// purposefully don't use 'ptr.offset' because for
|
||||||
// vectors with 0-size elements this would return the
|
// vectors with 0-size elements this would return the
|
||||||
// same pointer.
|
// same pointer.
|
||||||
self.ptr = arith_offset(self.ptr as *const i8, 1) as *const T;
|
self.ptr = arith_offset(self.ptr as *const i8, 1) as *mut T;
|
||||||
|
|
||||||
// Use a non-null pointer value
|
// Use a non-null pointer value
|
||||||
Some(ptr::read(EMPTY as *mut T))
|
Some(ptr::read(EMPTY as *mut T))
|
||||||
@ -1797,7 +1817,7 @@ impl<T> DoubleEndedIterator for IntoIter<T> {
|
|||||||
} else {
|
} else {
|
||||||
if mem::size_of::<T>() == 0 {
|
if mem::size_of::<T>() == 0 {
|
||||||
// See above for why 'ptr.offset' isn't used
|
// See above for why 'ptr.offset' isn't used
|
||||||
self.end = arith_offset(self.end as *const i8, -1) as *const T;
|
self.end = arith_offset(self.end as *const i8, -1) as *mut T;
|
||||||
|
|
||||||
// Use a non-null pointer value
|
// Use a non-null pointer value
|
||||||
Some(ptr::read(EMPTY as *mut T))
|
Some(ptr::read(EMPTY as *mut T))
|
||||||
|
@ -490,6 +490,17 @@ fn test_into_iter_as_slice() {
|
|||||||
assert_eq!(into_iter.as_slice(), &[]);
|
assert_eq!(into_iter.as_slice(), &[]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_into_iter_as_mut_slice() {
|
||||||
|
let vec = vec!['a', 'b', 'c'];
|
||||||
|
let mut into_iter = vec.into_iter();
|
||||||
|
assert_eq!(into_iter.as_slice(), &['a', 'b', 'c']);
|
||||||
|
into_iter.as_mut_slice()[0] = 'x';
|
||||||
|
into_iter.as_mut_slice()[1] = 'y';
|
||||||
|
assert_eq!(into_iter.next().unwrap(), 'x');
|
||||||
|
assert_eq!(into_iter.as_slice(), &['y', 'c']);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_into_iter_count() {
|
fn test_into_iter_count() {
|
||||||
assert_eq!(vec![1, 2, 3].into_iter().count(), 3);
|
assert_eq!(vec![1, 2, 3].into_iter().count(), 3);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user