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

[rust.git] / src / test / run-pass / static-impl.rs

diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs
index 520b3583195ae75b6548e3b7f96634be6186380c..9eb04d5dac129a3d36d3b2a09194cdce1f0ed73d 100644 (file)
--- a/src/test/run-pass/static-impl.rs
+++ b/src/test/run-pass/static-impl.rs
@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast
 
-use std::uint;
 
 pub trait plus {
     fn plus(&self) -> int;
@@ -28,12 +26,12 @@ impl plus for ~str { fn plus(&self) -> int { 200 } }
 
 trait uint_utils {
     fn str(&self) -> ~str;
-    fn multi(&self, f: &fn(uint));
+    fn multi(&self, f: |uint|);
 }
 
 impl uint_utils for uint {
     fn str(&self) -> ~str { self.to_str() }
-    fn multi(&self, f: &fn(uint)) {
+    fn multi(&self, f: |uint|) {
         let mut c = 0u;
         while c < *self { f(c); c += 1u; }
     }
@@ -41,15 +39,15 @@ fn multi(&self, f: &fn(uint)) {
 
 trait vec_utils<T> {
     fn length_(&self, ) -> uint;
-    fn iter_(&self, f: &fn(&T));
-    fn map_<U>(&self, f: &fn(&T) -> U) -> ~[U];
+    fn iter_(&self, f: |&T|);
+    fn map_<U>(&self, f: |&T| -> U) -> Vec<U> ;
 }
 
-impl<T> vec_utils<T> for ~[T] {
+impl<T> vec_utils<T> for Vec<T> {
     fn length_(&self) -> uint { self.len() }
-    fn iter_(&self, f: &fn(&T)) { for x in self.iter() { f(x); } }
-    fn map_<U>(&self, f: &fn(&T) -> U) -> ~[U] {
-        let mut r = ~[];
+    fn iter_(&self, f: |&T|) { for x in self.iter() { f(x); } }
+    fn map_<U>(&self, f: |&T| -> U) -> Vec<U> {
+        let mut r = Vec::new();
         for elt in self.iter() {
             r.push(f(elt));
         }
@@ -59,11 +57,13 @@ fn map_<U>(&self, f: &fn(&T) -> U) -> ~[U] {
 
 pub fn main() {
     assert_eq!(10u.plus(), 30);
-    assert_eq!((~"hi").plus(), 200);
+    assert_eq!(("hi".to_owned()).plus(), 200);
 
-    assert_eq!((~[1]).length_().str(), ~"1");
-    assert_eq!((~[3, 4]).map_(|a| *a + 4 )[0], 7);
-    assert_eq!((~[3, 4]).map_::<uint>(|a| *a as uint + 4u )[0], 7u);
+    assert_eq!((vec!(1)).length_().str(), "1".to_owned());
+    let vect = vec!(3, 4).map_(|a| *a + 4);
+    assert_eq!(*vect.get(0), 7);
+    let vect = (vec!(3, 4)).map_::<uint>(|a| *a as uint + 4u);
+    assert_eq!(*vect.get(0), 7u);
     let mut x = 0u;
     10u.multi(|_n| x += 2u );
     assert_eq!(x, 20u);