auto merge of #5119 : Kimundi/rust/incoming, r=catamorphism

Removed deprecated `str()` functions in int-template.rs and uint-template.rs

5 files changed, 5 insertions, 5 deletions

diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index a8383c4647e..28533821365 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -122,7 +122,7 @@ fn main() {
                 let elapsed = stop - start;
 
                 out.write_line(fmt!("%d\t%d\t%s", n, fibn,
-                                    u64::str(elapsed)));
+                                    u64::to_str(elapsed)));
             }
         }
     }
diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs
index 5f4e6e984a4..1f803f28e7a 100644
--- a/src/test/run-pass/monad.rs
+++ b/src/test/run-pass/monad.rs
@@ -36,7 +36,7 @@ impl<A> option_monad<A> for Option<A> {
 }
 
 fn transform(x: Option<int>) -> Option<~str> {
-    x.bind(|n| Some(*n + 1) ).bind(|n| Some(int::str(*n)) )
+    x.bind(|n| Some(*n + 1) ).bind(|n| Some(int::to_str(*n)) )
 }
 
 pub fn main() {
diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs
index 9d7c2fe446d..201193fd738 100644
--- a/src/test/run-pass/static-impl.rs
+++ b/src/test/run-pass/static-impl.rs
@@ -30,7 +30,7 @@ trait uint_utils {
 }
 
 impl uint_utils for uint {
-    fn str() -> ~str { uint::str(self) }
+    fn str() -> ~str { uint::to_str(self) }
     fn multi(f: fn(uint)) {
         let mut c = 0u;
         while c < self { f(c); c += 1u; }
diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs
index 1f32cc94de9..4a6651fe205 100644
--- a/src/test/run-pass/trait-generic.rs
+++ b/src/test/run-pass/trait-generic.rs
@@ -14,7 +14,7 @@ trait to_str {
     fn to_str() -> ~str;
 }
 impl to_str for int {
-    fn to_str() -> ~str { int::str(self) }
+    fn to_str() -> ~str { int::to_str(self) }
 }
 impl to_str for ~str {
     fn to_str() -> ~str { copy self }
diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs
index 20e23c0fc58..23d03ba2172 100644
--- a/src/test/run-pass/trait-to-str.rs
+++ b/src/test/run-pass/trait-to-str.rs
@@ -21,7 +21,7 @@ trait to_str {
 }
 
 impl to_str for int {
-    fn to_str() -> ~str { int::str(self) }
+    fn to_str() -> ~str { int::to_str(self) }
 }
 
 impl<T:to_str> to_str for ~[T] {