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

[rust.git] / src / test / run-pass / while-prelude-drop.rs

diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/run-pass/while-prelude-drop.rs
index 082f2db259a4aea2bbfb64fe1c85bf41f61ce972..bfabcb4d87b562df318e59bf34e14076baf277cf 100644 (file)
--- a/src/test/run-pass/while-prelude-drop.rs
+++ b/src/test/run-pass/while-prelude-drop.rs
@@ -8,17 +8,18 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use std::string::String;
 
-#[deriving(Eq)]
-enum t { a, b(~str), }
+#[derive(PartialEq)]
+enum t { a, b(String), }
 
 fn make(i: int) -> t {
-    if i > 10 { return a; }
-    let mut s = ~"hello";
+    if i > 10 { return t::a; }
+    let mut s = String::from_str("hello");
     // Ensure s is non-const.
 
-    s += ~"there";
-    return b(s);
+    s.push_str("there");
+    return t::b(s);
 }
 
 pub fn main() {
@@ -26,5 +27,5 @@ pub fn main() {
 
 
     // The auto slot for the result of make(i) should not leak.
-    while make(i) != a { i += 1; }
+    while make(i) != t::a { i += 1; }
 }