Finally rename std::_xxx to std::xxx

Except for _task, which is still a keyword.

7 files changed, 39 insertions, 39 deletions

diff --git a/src/test/bench/99-bottles/99bob-iter.rs b/src/test/bench/99-bottles/99bob-iter.rs
index 5aa3dc2f544..37194a39e51 100644
--- a/src/test/bench/99-bottles/99bob-iter.rs
+++ b/src/test/bench/99-bottles/99bob-iter.rs
@@ -3,8 +3,8 @@
  * http://99-bottles-of-beer.net/
  */
 use std;
-import std::_int;
-import std::_str;
+import std::int;
+import std::str;
 
 fn b1() -> str {
   ret "# of beer on the wall, # of beer.";
@@ -32,15 +32,15 @@ case (1) {
     ns = "1 bottle";
   }
  case (_) {
-    ns = _int::to_str(n, 10u) + " bottles";
+    ns = int::to_str(n, 10u) + " bottles";
   }
   }
-  while (i < _str::byte_len(t)) {
+  while (i < str::byte_len(t)) {
     if (t.(i) == ('#' as u8)) {
       b += ns;
     }
     else {
-      _str::push_byte(b, t.(i));
+      str::push_byte(b, t.(i));
     }
     i += 1u;
   }
diff --git a/src/test/bench/99-bottles/99bob-pattern.rs b/src/test/bench/99-bottles/99bob-pattern.rs
index 311fca460c8..96d61e8e232 100644
--- a/src/test/bench/99-bottles/99bob-pattern.rs
+++ b/src/test/bench/99-bottles/99bob-pattern.rs
@@ -3,8 +3,8 @@
  * http://99-bottles-of-beer.net/
  */
 use std;
-import std::_int;
-import std::_str;
+import std::int;
+import std::str;
 
 tag bottle { none; dual; single; multiple(int);}
 
@@ -25,8 +25,8 @@ fn show(bottle b) {
       log "Take one down and pass it around, 1 bottle of beer on the wall.";
     }
     case (multiple(?n)) {
-      let str nb =  _int::to_str(n, 10u);
-      let str mb = _int::to_str(n - 1, 10u);
+      let str nb =  int::to_str(n, 10u);
+      let str mb = int::to_str(n - 1, 10u);
       log nb + " bottles of beer on the wall, " + nb + " bottles of beer,";
       log "Take one down and pass it around, " 
         + mb + " bottles of beer on the wall.";
diff --git a/src/test/bench/99-bottles/99bob-simple.rs b/src/test/bench/99-bottles/99bob-simple.rs
index 569b076a5ec..6aa6d6b1e2e 100644
--- a/src/test/bench/99-bottles/99bob-simple.rs
+++ b/src/test/bench/99-bottles/99bob-simple.rs
@@ -3,8 +3,8 @@
  * http://99-bottles-of-beer.net/
  */
 use std;
-import std::_int;
-import std::_str;
+import std::int;
+import std::str;
 
 fn b1() -> str {
   ret "# of beer on the wall, # of beer.";
@@ -31,15 +31,15 @@ case (1) {
     ns = "1 bottle";
   }
  case (_) {
-    ns = _int::to_str(n, 10u) + " bottles";
+    ns = int::to_str(n, 10u) + " bottles";
   }
   }
-  while (i < _str::byte_len(t)) {
+  while (i < str::byte_len(t)) {
     if (t.(i) == ('#' as u8)) {
       b += ns;
     }
     else {
-      _str::push_byte(b, t.(i));
+      str::push_byte(b, t.(i));
     }
     i += 1u;
   }
diff --git a/src/test/bench/99-bottles/99bob-tail.rs b/src/test/bench/99-bottles/99bob-tail.rs
index 202b653b78f..8da4a5b76b7 100644
--- a/src/test/bench/99-bottles/99bob-tail.rs
+++ b/src/test/bench/99-bottles/99bob-tail.rs
@@ -3,13 +3,13 @@
  * http://99-bottles-of-beer.net/
  */
 use std;
-import std::_int;
-import std::_str;
+import std::int;
+import std::str;
 
 fn main() {
   fn multiple(int n) {
-    let str nb =  _int::to_str(n, 10u);
-    let str mb =  _int::to_str(n - 1, 10u);
+    let str nb =  int::to_str(n, 10u);
+    let str mb =  int::to_str(n - 1, 10u);
     log nb + " bottles of beer on the wall, " + nb + " bottles of beer,";
     log "Take one down and pass it around, " 
       + mb + " bottles of beer on the wall.";
diff --git a/src/test/bench/shootout/binarytrees.rs b/src/test/bench/shootout/binarytrees.rs
index 735ac2d506e..ef0de64363c 100644
--- a/src/test/bench/shootout/binarytrees.rs
+++ b/src/test/bench/shootout/binarytrees.rs
@@ -1,6 +1,6 @@
 use std;
 
-import std::_int;
+import std::int;
 
 tag tree {
   nil;
@@ -49,7 +49,7 @@ fn main() {
 
   auto depth = min_depth;
   while (depth <= max_depth) {
-    auto iterations = _int::pow(2, (max_depth - depth + min_depth) as uint);
+    auto iterations = int::pow(2, (max_depth - depth + min_depth) as uint);
     auto chk = 0;
 
     auto i = 1;
diff --git a/src/test/bench/shootout/fannkuchredux.rs b/src/test/bench/shootout/fannkuchredux.rs
index 0d24d338202..cca3592ce68 100644
--- a/src/test/bench/shootout/fannkuchredux.rs
+++ b/src/test/bench/shootout/fannkuchredux.rs
@@ -2,8 +2,8 @@
 
 use std;
 
-import std::_int;
-import std::_vec;
+import std::int;
+import std::vec;
 
 fn fannkuch(int n) -> int {
 
@@ -12,9 +12,9 @@ fn fannkuch(int n) -> int {
   }
   auto perm1init_ = perm1init; // Rustboot workaround
 
-  auto perm = _vec::init_elt(0, n as uint);
-  auto perm1 = _vec::init_fn(perm1init_, n as uint);
-  auto count = _vec::init_elt(0, n as uint);
+  auto perm = vec::init_elt(0, n as uint);
+  auto perm1 = vec::init_fn(perm1init_, n as uint);
+  auto count = vec::init_elt(0, n as uint);
 
   auto f = 0;
   auto i = 0;
diff --git a/src/test/bench/shootout/fasta.rs b/src/test/bench/shootout/fasta.rs
index b7a890971e3..1fc7ef43be3 100644
--- a/src/test/bench/shootout/fasta.rs
+++ b/src/test/bench/shootout/fasta.rs
@@ -7,10 +7,10 @@
  * http://shootout.alioth.debian.org/
  */
 use std;
-import std::_vec;
-import std::_str;
-import std::_uint;
-import std::_int;
+import std::vec;
+import std::str;
+import std::uint;
+import std::int;
 
 fn LINE_LENGTH() -> uint {
   ret 60u;
@@ -54,21 +54,21 @@ fn select_random(u32 r, vec[aminoacids] genelist) -> char {
       ret v.(hi)._0;
     }
   }
-  ret bisect(genelist, 0u, _vec::len[aminoacids](genelist) - 1u, r);
+  ret bisect(genelist, 0u, vec::len[aminoacids](genelist) - 1u, r);
 }
 
 fn make_random_fasta(str id, str desc, vec[aminoacids] genelist, int n) {
   log(">" + id + " " + desc);
   auto rng = myrandom(std::rand::mk_rng().next());
   let str op = "";
-  for each (uint i in _uint::range(0u, n as uint)) {
-    _str::push_byte(op, select_random(rng.next(100u32), genelist) as u8);
-    if (_str::byte_len(op) >= LINE_LENGTH()) {
+  for each (uint i in uint::range(0u, n as uint)) {
+    str::push_byte(op, select_random(rng.next(100u32), genelist) as u8);
+    if (str::byte_len(op) >= LINE_LENGTH()) {
       log(op);
       op = "";
     }
   }
-  if (_str::byte_len(op) > 0u) {
+  if (str::byte_len(op) > 0u) {
     log(op);
   }
 }
@@ -76,16 +76,16 @@ fn make_random_fasta(str id, str desc, vec[aminoacids] genelist, int n) {
 fn make_repeat_fasta(str id, str desc, str s, int n) {
   log(">" + id + " " + desc);
   let str op = "";
-  let uint sl = _str::byte_len(s);
-  for each (uint i in _uint::range(0u, n as uint)) {
+  let uint sl = str::byte_len(s);
+  for each (uint i in uint::range(0u, n as uint)) {
 
-    _str::push_byte(op, s.(i % sl));
-    if (_str::byte_len(op) >= LINE_LENGTH()) {
+    str::push_byte(op, s.(i % sl));
+    if (str::byte_len(op) >= LINE_LENGTH()) {
       log(op);
       op = "";
     }
   }
-  if (_str::byte_len(op) > 0u) {
+  if (str::byte_len(op) > 0u) {
     log(op);
   }
 }