From 2fcf81cc4b132bf7d862f5144d282391b38d0c15 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Fri, 5 Nov 2010 10:41:23 -0700 Subject: Revert "Move the option type to its own module" --- src/comp/driver/rustc.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/comp/driver') diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 154b87cb..920b47d2 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.option; -import std.option.some; -import std.option.none; +import std.util.option; +import std.util.some; +import std.util.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.t[str] input_file = none[str]; - let option.t[str] output_file = none[str]; + let option[str] input_file = none[str]; + let option[str] output_file = none[str]; let bool do_warn = true; auto i = 1u; -- cgit v1.2.3