diff options
| author | Patrick Walton <[email protected]> | 2010-11-05 10:41:23 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2010-11-05 10:41:23 -0700 |
| commit | 2fcf81cc4b132bf7d862f5144d282391b38d0c15 (patch) | |
| tree | d6e2c25528a83959111707cd7e29b4b30b93cf6a /src/comp/driver | |
| parent | rustboot: Describe the cycle when reporting a cyclic import error (diff) | |
| download | rust-2fcf81cc4b132bf7d862f5144d282391b38d0c15.tar.xz rust-2fcf81cc4b132bf7d862f5144d282391b38d0c15.zip | |
Revert "Move the option type to its own module"
Diffstat (limited to 'src/comp/driver')
| -rw-r--r-- | src/comp/driver/rustc.rs | 10 |
1 files changed, 5 insertions, 5 deletions
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; |