Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,5 @@ mod std {
pub use to_str;
pub use ty;
pub use unstable;
pub use vec;
}
56 changes: 52 additions & 4 deletions src/libstd/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,24 @@ impl<T: Clone> Vec<T> {

impl<T:Clone> Clone for Vec<T> {
fn clone(&self) -> Vec<T> {
let mut vector = Vec::with_capacity(self.len());
for element in self.iter() {
vector.push((*element).clone())
self.iter().map(|x| x.clone()).collect()
}

fn clone_from(&mut self, other: &Vec<T>) {
// drop anything in self that will not be overwritten
if self.len() > other.len() {
self.truncate(other.len())
}
vector

// reuse the contained values' allocations/resources.
for (place, thing) in self.mut_iter().zip(other.iter()) {
place.clone_from(thing)
}

// self.len <= other.len due to the truncate above, so the
// slice here is always in-bounds.
let len = self.len();
self.extend(other.slice_from(len).iter().map(|x| x.clone()));
}
}

Expand Down Expand Up @@ -1475,4 +1488,39 @@ mod tests {

assert!(values == Vec::from_slice([2u8, 3, 5, 6, 7]));
}

#[test]
fn test_clone() {
let v: Vec<int> = vec!();
let w = vec!(1, 2, 3);

assert_eq!(v, v.clone());

let z = w.clone();
assert_eq!(w, z);
// they should be disjoint in memory.
assert!(w.as_ptr() != z.as_ptr())
}

#[test]
fn test_clone_from() {
let mut v = vec!();
let three = vec!(~1, ~2, ~3);
let two = vec!(~4, ~5);
// zero, long
v.clone_from(&three);
assert_eq!(v, three);

// equal
v.clone_from(&three);
assert_eq!(v, three);

// long, short
v.clone_from(&two);
assert_eq!(v, two);

// short, long
v.clone_from(&three);
assert_eq!(v, three)
}
}