about summary refs log tree commit diff
path: root/src/libstd/priority_queue.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-09 11:18:43 -0700
committerbors <bors@rust-lang.org>2013-05-09 11:18:43 -0700
commitce9c0225c451c00c3eebe4e496185143a18814b9 (patch)
treec7e9b5e57ad703323939c5f95947bb31cfa26e38 /src/libstd/priority_queue.rs
parent7a4c6e587d631c0316d51c9b4a50d406f38221cd (diff)
parent2bc12635a24abf710304c06a91dbf3709cba8fd4 (diff)
downloadrust-ce9c0225c451c00c3eebe4e496185143a18814b9.tar.gz
rust-ce9c0225c451c00c3eebe4e496185143a18814b9.zip
auto merge of #6349 : thestinger/rust/explicit_copy, r=thestinger
I removed some of the copies, but most are just made explicit. The usage in `libcore` was already fixed, but the attribute was only set to warn (not removed).
Diffstat (limited to 'src/libstd/priority_queue.rs')
-rw-r--r--src/libstd/priority_queue.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs
index 9bf7db07ac9..248650452de 100644
--- a/src/libstd/priority_queue.rs
+++ b/src/libstd/priority_queue.rs
@@ -270,8 +270,8 @@ mod tests {
     }
 
     fn check_to_vec(data: ~[int]) {
-        let heap = from_vec(data);
-        assert!(merge_sort(heap.to_vec(), le) == merge_sort(data, le));
+        let heap = from_vec(copy data);
+        assert!(merge_sort((copy heap).to_vec(), le) == merge_sort(data, le));
         assert!(heap.to_sorted_vec() == merge_sort(data, le));
     }