Auto merge of #39493 - alexcrichton:beta-next, r=aturon

bors · bors · commit 90423c93dd16 · 2017-02-06T09:31:00.000Z
[beta] std: Fix IntoIter::as_mut_slice's signature This is a backport of #39466 to beta
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
@@ -1958,7 +1958,7 @@ impl<T> IntoIter<T> {
     /// assert_eq!(into_iter.next().unwrap(), 'z');
     /// ```
     #[stable(feature = "vec_into_iter_as_slice", since = "1.15.0")]
-    pub fn as_mut_slice(&self) -> &mut [T] {
+    pub fn as_mut_slice(&mut self) -> &mut [T] {
         unsafe {
             slice::from_raw_parts_mut(self.ptr as *mut T, self.len())
         }

Original file line number	Diff line number	Diff line change
`@@ -1958,7 +1958,7 @@ impl<T> IntoIter<T> {`
`1958`	`1958`	`/// assert_eq!(into_iter.next().unwrap(), 'z');`
`1959`	`1959`	/// ```
`1960`	`1960`	`#[stable(feature = "vec_into_iter_as_slice", since = "1.15.0")]`
`1961`		`- pub fn as_mut_slice(&self) -> &mut [T] {`
	`1961`	`+ pub fn as_mut_slice(&mut self) -> &mut [T] {`
`1962`	`1962`	`unsafe {`
`1963`	`1963`	`slice::from_raw_parts_mut(self.ptr as *mut T, self.len())`
`1964`	`1964`	`}`