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/middle | |
| 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/middle')
| -rw-r--r-- | src/comp/middle/fold.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/resolve.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/trans.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/comp/middle/fold.rs b/src/comp/middle/fold.rs index 069c5dfd..8b38c894 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 a491b56f..5741bac4 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 8334ac4a..1783925e 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; |