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/front | |
| 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/front')
| -rw-r--r-- | src/comp/front/ast.rs | 1 | ||||
| -rw-r--r-- | src/comp/front/parser.rs | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 5511a068..e635c119 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -1,4 +1,5 @@ +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 e3066436..d42f7b45 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -1,8 +1,8 @@ import std._io; -import std.option.some; -import std.option.none; -import std.map.hashmap; import std.util.option; +import std.util.some; +import std.util.none; +import std.map.hashmap; import driver.session; import util.common; |