Move the world over to using the new style string literals and types. Closes #2907.

1 files changed, 29 insertions, 29 deletions

diff --git a/src/libcore/uint-template.rs b/src/libcore/uint-template.rs
index 0433cd7ce30..7c4244efd9b 100644
--- a/src/libcore/uint-template.rs
+++ b/src/libcore/uint-template.rs
@@ -121,10 +121,10 @@ impl times of iter::times for T {
 }
 
 /// Parse a string to an int
-fn from_str(s: str) -> option<T> { parse_buf(str::bytes(s), 10u) }
+fn from_str(s: ~str) -> option<T> { parse_buf(str::bytes(s), 10u) }
 
 /// Parse a string as an unsigned integer.
-fn from_str_radix(buf: str, radix: u64) -> option<u64> {
+fn from_str_radix(buf: ~str, radix: u64) -> option<u64> {
     if str::len(buf) == 0u { ret none; }
     let mut i = str::len(buf) - 1u;
     let mut power = 1u64, n = 0u64;
@@ -146,7 +146,7 @@ fn from_str_radix(buf: str, radix: u64) -> option<u64> {
  *
  * Fails if `radix` < 2 or `radix` > 16
  */
-fn to_str(num: T, radix: uint) -> str {
+fn to_str(num: T, radix: uint) -> ~str {
     do to_str_bytes(false, num, radix) |slice| {
         do vec::unpack_slice(slice) |p, len| {
             unsafe { str::unsafe::from_buf_len(p, len) }
@@ -220,46 +220,46 @@ fn to_str_bytes<U>(neg: bool, num: T, radix: uint,
 }
 
 /// Convert to a string
-fn str(i: T) -> str { ret to_str(i, 10u); }
+fn str(i: T) -> ~str { ret to_str(i, 10u); }
 
 #[test]
 fn test_to_str() {
-    assert to_str(0 as T, 10u) == "0";
-    assert to_str(1 as T, 10u) == "1";
-    assert to_str(2 as T, 10u) == "2";
-    assert to_str(11 as T, 10u) == "11";
-    assert to_str(11 as T, 16u) == "b";
-    assert to_str(255 as T, 16u) == "ff";
-    assert to_str(0xff as T, 10u) == "255";
+    assert to_str(0 as T, 10u) == ~"0";
+    assert to_str(1 as T, 10u) == ~"1";
+    assert to_str(2 as T, 10u) == ~"2";
+    assert to_str(11 as T, 10u) == ~"11";
+    assert to_str(11 as T, 16u) == ~"b";
+    assert to_str(255 as T, 16u) == ~"ff";
+    assert to_str(0xff as T, 10u) == ~"255";
 }
 
 #[test]
 #[ignore]
 fn test_from_str() {
-    assert from_str("0") == some(0u as T);
-    assert from_str("3") == some(3u as T);
-    assert from_str("10") == some(10u as T);
-    assert from_str("123456789") == some(123456789u as T);
-    assert from_str("00100") == some(100u as T);
-
-    assert from_str("") == none;
-    assert from_str(" ") == none;
-    assert from_str("x") == none;
+    assert from_str(~"0") == some(0u as T);
+    assert from_str(~"3") == some(3u as T);
+    assert from_str(~"10") == some(10u as T);
+    assert from_str(~"123456789") == some(123456789u as T);
+    assert from_str(~"00100") == some(100u as T);
+
+    assert from_str(~"") == none;
+    assert from_str(~" ") == none;
+    assert from_str(~"x") == none;
 }
 
 #[test]
 #[ignore]
 fn test_parse_buf() {
     import str::bytes;
-    assert parse_buf(bytes("123"), 10u) == some(123u as T);
-    assert parse_buf(bytes("1001"), 2u) == some(9u as T);
-    assert parse_buf(bytes("123"), 8u) == some(83u as T);
-    assert parse_buf(bytes("123"), 16u) == some(291u as T);
-    assert parse_buf(bytes("ffff"), 16u) == some(65535u as T);
-    assert parse_buf(bytes("z"), 36u) == some(35u as T);
-
-    assert parse_buf(str::bytes("Z"), 10u) == none;
-    assert parse_buf(str::bytes("_"), 2u) == none;
+    assert parse_buf(bytes(~"123"), 10u) == some(123u as T);
+    assert parse_buf(bytes(~"1001"), 2u) == some(9u as T);
+    assert parse_buf(bytes(~"123"), 8u) == some(83u as T);
+    assert parse_buf(bytes(~"123"), 16u) == some(291u as T);
+    assert parse_buf(bytes(~"ffff"), 16u) == some(65535u as T);
+    assert parse_buf(bytes(~"z"), 36u) == some(35u as T);
+
+    assert parse_buf(str::bytes(~"Z"), 10u) == none;
+    assert parse_buf(str::bytes(~"_"), 2u) == none;
 }
 
 #[test]