Replace all ~"" with "".to_owned()

[rust.git] / src / test / run-pass / swap-overlapping.rs

diff --git a/src/test/run-pass/swap-overlapping.rs b/src/test/run-pass/swap-overlapping.rs
index 05f943bf928ca70b25ff385c10da026aedb7944f..2e10c9347784e788a98d55ee51fbcbab112b799c 100644 (file)
--- a/src/test/run-pass/swap-overlapping.rs
+++ b/src/test/run-pass/swap-overlapping.rs
@@ -10,23 +10,22 @@
 
 // Issue #5041 - avoid overlapping memcpy when src and dest of a swap are the same
 
-use core::util;
+use std::ptr;
 
 pub fn main() {
     let mut test = TestDescAndFn {
         desc: TestDesc {
-            name: DynTestName(~"test"),
+            name: DynTestName("test".to_owned()),
             should_fail: false
         },
-        testfn: DynTestFn(|| ()),
+        testfn: DynTestFn(proc() ()),
     };
     do_swap(&mut test);
 }
 
 fn do_swap(test: &mut TestDescAndFn) {
     unsafe {
-        util::swap_ptr(ptr::to_mut_unsafe_ptr(test),
-                       ptr::to_mut_unsafe_ptr(test));
+        ptr::swap(test, test);
     }
 }
 
@@ -35,8 +34,8 @@ pub enum TestName {
 }
 
 pub enum TestFn {
-    DynTestFn(~fn()),
-    DynBenchFn(~fn(&mut int))
+    DynTestFn(proc()),
+    DynBenchFn(proc(&mut int))
 }
 
 pub struct TestDesc {