1 files changed, 24 insertions, 23 deletions

diff --git a/src/comp/front/extenv.rs b/src/comp/front/extenv.rs
index a7fd545d..f9ac6a52 100644
--- a/src/comp/front/extenv.rs
+++ b/src/comp/front/extenv.rs
@@ -4,47 +4,47 @@
  * interface.
  */
 
-import util.common;
+import util::common;
 
-import std.Str;
-import std.Vec;
-import std.Option;
-import std.GenericOS;
+import std::_str;
+import std::_vec;
+import std::option;
+import std::generic_os;
 
 export expand_syntax_ext;
 
 // FIXME: Need to thread parser through here to handle errors correctly
-fn expand_syntax_ext(parser.parser p,
-                     common.span sp,
-                     vec[@ast.expr] args,
-                     Option.t[str] body) -> @ast.expr {
+fn expand_syntax_ext(parser::parser p,
+                     common::span sp,
+                     vec[@ast::expr] args,
+                     option::t[str] body) -> @ast::expr {
 
-    if (Vec.len[@ast.expr](args) != 1u) {
+    if (_vec::len[@ast::expr](args) != 1u) {
         p.err("malformed #env call");
     }
 
     // FIXME: if this was more thorough it would manufacture an
-    // Option.t[str] rather than just an maybe-empty string.
+    // option::t[str] rather than just an maybe-empty string.
 
     auto var = expr_to_str(p, args.(0));
-    alt (GenericOS.getenv(var)) {
-        case (Option.none[str]) {
+    alt (generic_os::getenv(var)) {
+        case (option::none[str]) {
             ret make_new_str(p, sp, "");
         }
-        case (Option.some[str](?s)) {
+        case (option::some[str](?s)) {
             ret make_new_str(p, sp, s);
         }
     }
 }
 
-// FIXME: duplicate code copied from extfmt.
+// FIXME: duplicate code copied from extfmt:
 
-fn expr_to_str(parser.parser p,
-               @ast.expr expr) -> str {
+fn expr_to_str(parser::parser p,
+               @ast::expr expr) -> str {
     alt (expr.node) {
-        case (ast.expr_lit(?l, _)) {
+        case (ast::expr_lit(?l, _)) {
             alt (l.node) {
-                case (ast.lit_str(?s)) {
+                case (ast::lit_str(?s)) {
                     ret s;
                 }
             }
@@ -54,14 +54,15 @@ fn expr_to_str(parser.parser p,
     fail;
 }
 
-fn make_new_lit(parser.parser p, common.span sp, ast.lit_ lit) -> @ast.expr {
+fn make_new_lit(parser::parser p, common::span sp, ast::lit_ lit)
+    -> @ast::expr {
     auto sp_lit = @rec(node=lit, span=sp);
-    auto expr = ast.expr_lit(sp_lit, p.get_ann());
+    auto expr = ast::expr_lit(sp_lit, p.get_ann());
     ret @rec(node=expr, span=sp);
 }
 
-fn make_new_str(parser.parser p, common.span sp, str s) -> @ast.expr {
-    auto lit = ast.lit_str(s);
+fn make_new_str(parser::parser p, common::span sp, str s) -> @ast::expr {
+    auto lit = ast::lit_str(s);
     ret make_new_lit(p, sp, lit);
 }