Skip to content

Commit c9abc01

Browse files
committed
core: Rename MutableCloneableSlice::copy_from to clone_from_slice
Deprecate the previous.
1 parent d4c736b commit c9abc01

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/libcore/slice.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,12 @@ impl<'a, T: Ord> ImmutableOrdSlice<T> for &'a [T] {
837837

838838
/// Trait for &[T] where T is Cloneable
839839
pub trait MutableCloneableSlice<T> {
840+
/// Copies as many elements from `src` as it can into `self` (the
841+
/// shorter of `self.len()` and `src.len()`). Returns the number
842+
/// of elements copied.
843+
#[deprecated = "renamed to clone_from_slice"]
844+
fn copy_from(self, s: &[T]) -> uint { self.clone_from_slice(s) }
845+
840846
/// Copies as many elements from `src` as it can into `self` (the
841847
/// shorter of `self.len()` and `src.len()`). Returns the number
842848
/// of elements copied.
@@ -856,12 +862,12 @@ pub trait MutableCloneableSlice<T> {
856862
/// assert!(dst.copy_from(src2) == 3);
857863
/// assert!(dst == [3i, 4, 5]);
858864
/// ```
859-
fn copy_from(self, &[T]) -> uint;
865+
fn clone_from_slice(self, &[T]) -> uint;
860866
}
861867

862868
impl<'a, T:Clone> MutableCloneableSlice<T> for &'a mut [T] {
863869
#[inline]
864-
fn copy_from(self, src: &[T]) -> uint {
870+
fn clone_from_slice(self, src: &[T]) -> uint {
865871
for (a, b) in self.mut_iter().zip(src.iter()) {
866872
a.clone_from(b);
867873
}

0 commit comments

Comments
 (0)