diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-01-31 17:05:20 -0800 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-01-31 17:05:20 -0800 |
| commit | e5d095d67e3926fa104ac495076fe9d4cd4f5562 (patch) | |
| tree | 07be94199b1062e4ba99be9c014178d26543a0aa /src/comp/syntax/parse/eval.rs | |
| parent | 1f795ff3b0c0cac31c1d9fd2406d0d53e774683a (diff) | |
Change option::t to option
Now that core exports "option" as a synonym for option::t, search-and- replace option::t with option. The only place that still refers to option::t are the modules in libcore that use option, because fixing this requires a new snapshot (forthcoming).
Diffstat (limited to 'src/comp/syntax/parse/eval.rs')
| -rw-r--r-- | src/comp/syntax/parse/eval.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/comp/syntax/parse/eval.rs b/src/comp/syntax/parse/eval.rs index 2530c794c94..74d2259c51e 100644 --- a/src/comp/syntax/parse/eval.rs +++ b/src/comp/syntax/parse/eval.rs @@ -25,7 +25,7 @@ fn eval_crate_directives(cx: ctx, cdirs: [@ast::crate_directive], prefix: str, } fn eval_crate_directives_to_mod(cx: ctx, cdirs: [@ast::crate_directive], - prefix: str, suffix: option::t<str>) + prefix: str, suffix: option<str>) -> (ast::_mod, [ast::attribute]) { #debug("eval crate prefix: %s", prefix); #debug("eval crate suffix: %s", @@ -50,10 +50,10 @@ companion mod is a .rs file with the same name as the directory. We build the path to the companion mod by combining the prefix and the optional suffix then adding the .rs extension. */ -fn parse_companion_mod(cx: ctx, prefix: str, suffix: option::t<str>) +fn parse_companion_mod(cx: ctx, prefix: str, suffix: option<str>) -> ([@ast::view_item], [@ast::item], [ast::attribute]) { - fn companion_file(prefix: str, suffix: option::t<str>) -> str { + fn companion_file(prefix: str, suffix: option<str>) -> str { ret alt suffix { option::some(s) { fs::connect(prefix, s) } option::none { prefix } |
