diff options
| author | Patrick Walton <[email protected]> | 2010-11-03 17:10:37 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2010-11-05 11:18:40 -0700 |
| commit | adb1754e4dcbf61abb93ac7604aed4e8bca080a8 (patch) | |
| tree | 037acbf63e189a999291e04a9a9db4e777e9c003 /src/comp/middle/trans.rs | |
| parent | rustboot: Report cyclic import errors at the right location (diff) | |
| download | rust-adb1754e4dcbf61abb93ac7604aed4e8bca080a8.tar.xz rust-adb1754e4dcbf61abb93ac7604aed4e8bca080a8.zip | |
Move the option type to its own module
Diffstat (limited to 'src/comp/middle/trans.rs')
| -rw-r--r-- | src/comp/middle/trans.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 1783925e..ba4f5cdf 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.util.option; -import std.util.some; -import std.util.none; +import std.option; +import std.option.some; +import std.option.none; import front.ast; import driver.session; @@ -613,7 +613,7 @@ impure fn trans_binary(@block_ctxt cx, ast.binop op, } impure fn trans_if(@block_ctxt cx, &ast.expr cond, - &ast.block thn, &option[ast.block] els) -> result { + &ast.block thn, &option.t[ast.block] els) -> result { auto cond_res = trans_expr(cx, cond); @@ -868,7 +868,7 @@ impure fn trans_check_expr(@block_ctxt cx, &ast.expr e) -> result { ret res(next_cx, C_nil()); } -impure fn trans_ret(@block_ctxt cx, &option[@ast.expr] e) -> result { +impure fn trans_ret(@block_ctxt cx, &option.t[@ast.expr] e) -> result { auto r = res(cx, C_nil()); alt (e) { case (some[@ast.expr](?x)) { |