Downcase std modules again, move to :: for module dereferencing

This should be a snapshot transition.

8 files changed, 71 insertions, 71 deletions

diff --git a/src/test/bench/99-bottles/99bob-iter.rs b/src/test/bench/99-bottles/99bob-iter.rs
index e8cc4b4b..5aa3dc2f 100644
--- a/src/test/bench/99-bottles/99bob-iter.rs
+++ b/src/test/bench/99-bottles/99bob-iter.rs
@@ -1,10 +1,10 @@
-/* -*- mode:rust;indent-tabs-mode:nil -*- 
+/* -*- mode::rust;indent-tabs-mode::nil -*- 
  * Implementation of 99 Bottles of Beer
  * 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 fc9ddddb..311fca46 100644
--- a/src/test/bench/99-bottles/99bob-pattern.rs
+++ b/src/test/bench/99-bottles/99bob-pattern.rs
@@ -1,10 +1,10 @@
-/* -*- mode:rust;indent-tabs-mode:nil -*- 
+/* -*- mode::rust;indent-tabs-mode::nil -*- 
  * Implementation of 99 Bottles of Beer
  * 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 5c0f0824..569b076a 100644
--- a/src/test/bench/99-bottles/99bob-simple.rs
+++ b/src/test/bench/99-bottles/99bob-simple.rs
@@ -1,10 +1,10 @@
-/* -*- mode:rust;indent-tabs-mode:nil -*- 
+/* -*- mode::rust;indent-tabs-mode::nil -*- 
  * Implementation of 99 Bottles of Beer
  * 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 985d9b4b..202b653b 100644
--- a/src/test/bench/99-bottles/99bob-tail.rs
+++ b/src/test/bench/99-bottles/99bob-tail.rs
@@ -1,15 +1,15 @@
-/* -*- mode:rust;indent-tabs-mode:nil -*- 
+/* -*- mode::rust;indent-tabs-mode::nil -*- 
  * Implementation of 99 Bottles of Beer
  * 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 aa81aaac..735ac2d5 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 5af56a47..0d24d338 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 3543c298..ec962e38 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());
+  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);
   }
 }
diff --git a/src/test/bench/shootout/nbody.rs b/src/test/bench/shootout/nbody.rs
index f2041c0e..b665e760 100644
--- a/src/test/bench/shootout/nbody.rs
+++ b/src/test/bench/shootout/nbody.rs
@@ -19,33 +19,33 @@ fn main() {
                               // 50000000
         );
 
-    let vec[Body.props] bodies = NBodySystem.MakeNBodySystem();
+    let vec[Body::props] bodies = NBodySystem::MakeNBodySystem();
 
     for (int n in inputs) {
-        log NBodySystem.energy(bodies);
+        log NBodySystem::energy(bodies);
 
         let int i = 0;
         while (i < n) {
-            NBodySystem.advance(bodies, 0.01);
+            NBodySystem::advance(bodies, 0.01);
             i += 1;
         }
-        log NBodySystem.energy(bodies);
+        log NBodySystem::energy(bodies);
     }
 }
 
-// Body.props is a record of floats, so
-// vec[Body.props] is a vector of records of floats
+// Body::props is a record of floats, so
+// vec[Body::props] is a vector of records of floats
 
 mod NBodySystem {
 
-    fn MakeNBodySystem() -> vec[Body.props] {
-        let vec[Body.props] bodies = vec(
-            // these each return a Body.props
-            Body.sun(), 
-            Body.jupiter(), 
-            Body.saturn(), 
-            Body.uranus(), 
-            Body.neptune());
+    fn MakeNBodySystem() -> vec[Body::props] {
+        let vec[Body::props] bodies = vec(
+            // these each return a Body::props
+            Body::sun(), 
+            Body::jupiter(), 
+            Body::saturn(), 
+            Body::uranus(), 
+            Body::neptune());
 
         let float px = 0.0;
         let float py = 0.0;
@@ -61,12 +61,12 @@ mod NBodySystem {
         }
 
         // side-effecting
-        Body.offsetMomentum(bodies.(0), px, py, pz);
+        Body::offsetMomentum(bodies.(0), px, py, pz);
 
         ret bodies;
     }
 
-    fn advance(vec[Body.props] bodies, float dt) -> () {
+    fn advance(vec[Body::props] bodies, float dt) -> () {
 
         let int i = 0;
         while (i < 5) {
@@ -86,14 +86,14 @@ mod NBodySystem {
         }
     }
 
-    fn advance_one(&Body.props bi, &Body.props bj, float dt) {
+    fn advance_one(&Body::props bi, &Body::props bj, float dt) {
         let float dx = bi.x - bj.x;
         let float dy = bi.y - bj.y;
         let float dz = bi.z - bj.z;
 
         let float dSquared = dx * dx + dy * dy + dz * dz;
 
-        let float distance = llvm.sqrt(dSquared);
+        let float distance = llvm::sqrt(dSquared);
         let float mag = dt / (dSquared * distance);
 
         bi.vx -= dx * bj.mass * mag;
@@ -105,13 +105,13 @@ mod NBodySystem {
         bj.vz += dz * bi.mass * mag;
     }
 
-    fn move(&Body.props b, float dt) {
+    fn move(&Body::props b, float dt) {
         b.x += dt * b.vx;
         b.y += dt * b.vy;
         b.z += dt * b.vz;
     }
 
-    fn energy(vec[Body.props] bodies) -> float {
+    fn energy(vec[Body::props] bodies) -> float {
         let float dx;
         let float dy;
         let float dz;
@@ -131,7 +131,7 @@ mod NBodySystem {
                 dy = bodies.(i).y - bodies.(j).y;
                 dz = bodies.(i).z - bodies.(j).z;
 
-                distance = llvm.sqrt(dx*dx + dy*dy + dz*dz);
+                distance = llvm::sqrt(dx*dx + dy*dy + dz*dz);
                 e -= (bodies.(i).mass * bodies.(j).mass) / distance;
                 
                 j += 1;
@@ -158,7 +158,7 @@ mod Body {
                      mutable float vz, 
                      float mass);
 
-    fn jupiter() -> Body.props {
+    fn jupiter() -> Body::props {
         ret rec(
             mutable x  =  4.84143144246472090e+00,
             mutable y  = -1.16032004402742839e+00,
@@ -170,7 +170,7 @@ mod Body {
             );
     }
 
-    fn saturn() -> Body.props {
+    fn saturn() -> Body::props {
         ret rec(
             mutable x  =  8.34336671824457987e+00,
             mutable y  =  4.12479856412430479e+00,
@@ -182,7 +182,7 @@ mod Body {
             );
    }
 
-    fn uranus() -> Body.props {
+    fn uranus() -> Body::props {
         ret rec(
             mutable x  =  1.28943695621391310e+01,
             mutable y  = -1.51111514016986312e+01,
@@ -194,7 +194,7 @@ mod Body {
             );
     }
 
-    fn neptune() -> Body.props {
+    fn neptune() -> Body::props {
         ret rec(
             mutable x  =  1.53796971148509165e+01,
             mutable y  = -2.59193146099879641e+01,
@@ -206,7 +206,7 @@ mod Body {
             );
    }
 
-   fn sun() -> Body.props {
+   fn sun() -> Body::props {
        ret rec(
            mutable x  =  0.0,
            mutable y  =  0.0,
@@ -218,7 +218,7 @@ mod Body {
            );
    }
 
-   fn offsetMomentum(&Body.props props,
+   fn offsetMomentum(&Body::props props,
                             float px, 
                             float py, 
                             float pz) -> () {