diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-02-03 17:07:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 17:07:57 -0800 |
| commit | 3eb6ff92e761591aaa357c8ad466dfd4f503c355 (patch) | |
| tree | 56cdec987b64e161085b42400bb276b101339785 | |
| parent | 10893a9a349cdd423f2490a6984acb5b3b7c8046 (diff) | |
| parent | 1d2a8e2de6645a4aef037544956feec25aeb5c13 (diff) | |
| download | rust-3eb6ff92e761591aaa357c8ad466dfd4f503c355.tar.gz rust-3eb6ff92e761591aaa357c8ad466dfd4f503c355.zip | |
Merge pull request #39516 from brson/stable-next
[stable] next
| -rw-r--r-- | RELEASES.md | 8 | ||||
| -rw-r--r-- | mk/main.mk | 2 | ||||
| -rw-r--r-- | src/libcollections/vec.rs | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/RELEASES.md b/RELEASES.md index b8ddeaf32b0..98fd6766d4c 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,11 @@ +Version 1.15.1 (2017-02-07) +=========================== + +* [Fix IntoIter::as_mut_slice's signature][39466] + +[39466]: https://github.com/rust-lang/rust/pull/39466 + + Version 1.15.0 (2017-02-02) =========================== diff --git a/mk/main.mk b/mk/main.mk index e77182ae399..05500f507ae 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -13,7 +13,7 @@ ###################################################################### # The version number -CFG_RELEASE_NUM=1.15.0 +CFG_RELEASE_NUM=1.15.1 # An optional number to put after the label, e.g. '.2' -> '-beta.2' # NB Make sure it starts with a dot to conform to semver pre-release diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index f2ef54f6e56..e212592eda7 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1929,7 +1929,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()) } |