1 files changed, 15 insertions, 15 deletions

diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs
index a1b3392c..e1ad59bc 100644
--- a/src/comp/front/eval.rs
+++ b/src/comp/front/eval.rs
@@ -1,9 +1,9 @@
-import std._vec;
-import std._str;
-import std.option;
-import std.option.some;
-import std.option.none;
-import std.map.hashmap;
+import std.Vec;
+import std.Str;
+import std.Option;
+import std.Option.some;
+import std.Option.none;
+import std.Map.hashmap;
 
 import driver.session;
 import ast.ident;
@@ -91,7 +91,7 @@ fn val_as_str(val v) -> str {
 
 fn lookup(session.session sess, env e, span sp, ident i) -> val {
     for (tup(ident, val) pair in e) {
-        if (_str.eq(i, pair._0)) {
+        if (Str.eq(i, pair._0)) {
             ret pair._1;
         }
     }
@@ -114,8 +114,8 @@ fn eval_lit(ctx cx, span sp, @ast.lit lit) -> val {
 fn eval_expr(ctx cx, env e, @ast.expr x) -> val {
     alt (x.node) {
         case (ast.expr_path(?pth, _, _)) {
-            if (_vec.len[ident](pth.node.idents) == 1u &&
-                _vec.len[@ast.ty](pth.node.types) == 0u) {
+            if (Vec.len[ident](pth.node.idents) == 1u &&
+                Vec.len[@ast.ty](pth.node.types) == 0u) {
                 ret lookup(cx.sess, e, x.span, pth.node.idents.(0));
             }
             cx.sess.span_err(x.span, "evaluating structured path-name");
@@ -224,7 +224,7 @@ fn val_eq(session.session sess, span sp, val av, val bv) -> bool {
         ret val_as_int(av) == val_as_int(bv);
     }
     if (val_is_str(av) && val_is_str(bv)) {
-        ret _str.eq(val_as_str(av),
+        ret Str.eq(val_as_str(av),
                     val_as_str(bv));
     }
     sess.span_err(sp, "bad types in comparison");
@@ -388,7 +388,7 @@ fn eval_crate_directive(ctx cx,
                 case (none[filename]) {}
             }
 
-            auto full_path = prefix + std.fs.path_sep() + file_path;
+            auto full_path = prefix + std.FS.path_sep() + file_path;
 
             if (cx.mode == mode_depend) {
                 cx.deps += vec(full_path);
@@ -405,7 +405,7 @@ fn eval_crate_directive(ctx cx,
             auto im = ast.item_mod(id, m0, next_id);
             auto i = @spanned(cdir.span.lo, cdir.span.hi, im);
             ast.index_item(index, i);
-            _vec.push[@ast.item](items, i);
+            Vec.push[@ast.item](items, i);
         }
 
         case (ast.cdir_dir_mod(?id, ?dir_opt, ?cdirs)) {
@@ -418,16 +418,16 @@ fn eval_crate_directive(ctx cx,
                 case (none[filename]) {}
             }
 
-            auto full_path = prefix + std.fs.path_sep() + path;
+            auto full_path = prefix + std.FS.path_sep() + path;
             auto m0 = eval_crate_directives_to_mod(cx, e, cdirs, full_path);
             auto im = ast.item_mod(id, m0, cx.p.next_def_id());
             auto i = @spanned(cdir.span.lo, cdir.span.hi, im);
             ast.index_item(index, i);
-            _vec.push[@ast.item](items, i);
+            Vec.push[@ast.item](items, i);
         }
 
         case (ast.cdir_view_item(?vi)) {
-            _vec.push[@ast.view_item](view_items, vi);
+            Vec.push[@ast.view_item](view_items, vi);
             ast.index_view_item(index, vi);
         }