cleanup: s/impl Copy/#[derive(Copy)]/g

[rust.git] / src / test / run-pass / newtype-polymorphic.rs

diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs
index 7bc28e6b00ff58205ccdd01370f7eb6e540ba12d..74487f5b57d6be745bb378a4fbc8ebe4916c0232 100644 (file)
--- a/src/test/run-pass/newtype-polymorphic.rs
+++ b/src/test/run-pass/newtype-polymorphic.rs
@@ -8,22 +8,25 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Clone)]
-struct myvec<X>(~[X]);
 
-fn myvec_deref<X:Clone>(mv: myvec<X>) -> ~[X] {
+#[derive(Clone)]
+struct myvec<X>(Vec<X> );
+
+fn myvec_deref<X:Clone>(mv: myvec<X>) -> Vec<X> {
     let myvec(v) = mv;
     return v.clone();
 }
 
 fn myvec_elt<X>(mv: myvec<X>) -> X {
     let myvec(v) = mv;
-    return v[0];
+    return v.into_iter().next().unwrap();
 }
 
 pub fn main() {
-    let mv = myvec(~[1, 2, 3]);
-    assert_eq!(myvec_deref(mv.clone())[1], 2);
+    let mv = myvec(vec!(1i, 2, 3));
+    let mv_clone = mv.clone();
+    let mv_clone = myvec_deref(mv_clone);
+    assert_eq!(mv_clone[1], 2);
     assert_eq!(myvec_elt(mv.clone()), 1);
     let myvec(v) = mv;
     assert_eq!(v[2], 3);