提交 6e29f86b 编写于 作者: B Boris Egorov

Remove into_vec method from &[T]

[breaking-change]
Closes #17916
上级 1add4ded
......@@ -277,12 +277,14 @@ fn to_owned(&self) -> Vec<T> {
}
/// Converts `self` into an owned vector, not making a copy if possible.
/// Deprecated. Use 'to_vec'
#[deprecated = "Replaced by `to_vec`"]
fn into_vec(self) -> Vec<T>;
/// Deprecated. Use `into_vec`
#[deprecated = "Replaced by `into_vec`"]
/// Deprecated. Use `to_vec`
#[deprecated = "Replaced by `to_vec`"]
fn into_owned(self) -> Vec<T> {
self.into_vec()
self.to_vec()
}
}
......@@ -2328,9 +2330,9 @@ fn test_mut_last() {
}
#[test]
fn test_into_vec() {
fn test_to_vec() {
let xs = box [1u, 2, 3];
let ys = xs.into_vec();
let ys = xs.to_vec();
assert_eq!(ys.as_slice(), [1u, 2, 3].as_slice());
}
}
......
......@@ -614,13 +614,6 @@ fn len(&self) -> uint {
}
}
impl<T: Clone> CloneableVector<T> for Vec<T> {
#[deprecated = "call .clone() instead"]
fn to_vec(&self) -> Vec<T> { self.clone() }
#[deprecated = "move the vector instead"]
fn into_vec(self) -> Vec<T> { self }
}
// FIXME: #13996: need a way to mark the return value as `noalias`
#[inline(never)]
unsafe fn alloc_or_realloc<T>(ptr: *mut T, old_size: uint, size: uint) -> *mut T {
......
......@@ -140,7 +140,7 @@ fn into_vec(self) -> Vec<T> {
impl<'a, T: Clone> Clone for MaybeOwnedVector<'a, T> {
fn clone(&self) -> MaybeOwnedVector<'a, T> {
match *self {
Growable(ref v) => Growable(v.to_vec()),
Growable(ref v) => Growable(v.clone()),
Borrowed(v) => Borrowed(v)
}
}
......
......@@ -1014,7 +1014,7 @@ fn builtin_bound(&mut self,
ty::ty_tup(ref tys) => {
// (T1, ..., Tn) -- meets any bound that all of T1...Tn meet
Ok(If(tys.to_owned()))
Ok(If(tys.clone()))
}
ty::ty_unboxed_closure(def_id, _) => {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册