Move the option type to its own module

6 files changed, 14 insertions, 15 deletions

diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 920b47d2..154b87cb 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -5,9 +5,9 @@ import front.token;
 import middle.trans;
 import middle.resolve;
 
-import std.util.option;
-import std.util.some;
-import std.util.none;
+import std.option;
+import std.option.some;
+import std.option.none;
 import std._str;
 import std._vec;
 
@@ -39,8 +39,8 @@ fn usage(session.session sess, str argv0) {
 impure fn main(vec[str] args) {
 
   auto sess = session.session();
-  let option[str] input_file = none[str];
-  let option[str] output_file = none[str];
+  let option.t[str] input_file = none[str];
+  let option.t[str] output_file = none[str];
   let bool do_warn = true;
 
   auto i = 1u;
diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs
index e635c119..5511a068 100644
--- a/src/comp/front/ast.rs
+++ b/src/comp/front/ast.rs
@@ -1,5 +1,4 @@
 
-import util.common.option;
 import std.map.hashmap;
 import std.util.option;
 import util.common.span;
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index d42f7b45..e3066436 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -1,8 +1,8 @@
 import std._io;
-import std.util.option;
-import std.util.some;
-import std.util.none;
+import std.option.some;
+import std.option.none;
 import std.map.hashmap;
+import std.util.option;
 
 import driver.session;
 import util.common;
diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs
index 8b38c894..069c5dfd 100644
--- a/src/comp/middle/fold.rs
+++ b/src/comp/middle/fold.rs
@@ -1,7 +1,7 @@
 import std.map.hashmap;
+import std.option.some;
+import std.option.none;
 import std.util.option;
-import std.util.some;
-import std.util.none;
 
 import util.common.new_str_hash;
 import util.common.spanned;
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index 5741bac4..a491b56f 100644
--- a/src/comp/middle/resolve.rs
+++ b/src/comp/middle/resolve.rs
@@ -8,9 +8,9 @@ import std.map.hashmap;
 import std.list.list;
 import std.list.nil;
 import std.list.cons;
+import std.option.some;
+import std.option.none;
 import std.util.option;
-import std.util.some;
-import std.util.none;
 import std._str;
 
 tag scope {
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index 1783925e..8334ac4a 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -3,9 +3,9 @@ import std._vec;
 import std._str.rustrt.sbuf;
 import std._vec.rustrt.vbuf;
 import std.map.hashmap;
+import std.option.some;
+import std.option.none;
 import std.util.option;
-import std.util.some;
-import std.util.none;
 
 import front.ast;
 import driver.session;