Skip to content

Commit e2342e0

Browse files
committed
---
yaml --- r: 128261 b: refs/heads/snap-stage3 c: c9abc01 h: refs/heads/master i: 128259: 92899c0 v: v3
1 parent ef5a42c commit e2342e0

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cb9c1e0e702f4a1a5dfc909b15b74e8556013c06
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d4c736b1f0bd76fc083f1710f16f07e0e15fe6a0
4+
refs/heads/snap-stage3: c9abc01a985a7634b8fc73d9862ecea6181c3c11
55
refs/heads/try: 73b8f60b60d8a2a7ca5a7d49d59771350b867951
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)