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/driver | |
| parent | 1f795ff3b0c0cac31c1d9fd2406d0d53e774683a (diff) | |
| download | rust-e5d095d67e3926fa104ac495076fe9d4cd4f5562.tar.gz rust-e5d095d67e3926fa104ac495076fe9d4cd4f5562.zip | |
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/driver')
| -rw-r--r-- | src/comp/driver/driver.rs | 10 | ||||
| -rw-r--r-- | src/comp/driver/session.rs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/comp/driver/driver.rs b/src/comp/driver/driver.rs index 8781c07b4aa..3a96762f41e 100644 --- a/src/comp/driver/driver.rs +++ b/src/comp/driver/driver.rs @@ -105,8 +105,8 @@ enum compile_upto { fn compile_upto(sess: session, cfg: ast::crate_cfg, input: str, upto: compile_upto, - outputs: option::t<output_filenames>) - -> {crate: @ast::crate, tcx: option::t<ty::ctxt>} { + outputs: option<output_filenames>) + -> {crate: @ast::crate, tcx: option<ty::ctxt>} { let time_passes = sess.opts.time_passes; let crate = time(time_passes, "parsing", bind parse_input(sess, cfg, input)); @@ -197,7 +197,7 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg, } fn compile_input(sess: session, cfg: ast::crate_cfg, input: str, - outdir: option::t<str>, output: option::t<str>) { + outdir: option<str>, output: option<str>) { let upto = if sess.opts.parse_only { cu_parse } else if sess.opts.no_trans { cu_no_trans } @@ -504,8 +504,8 @@ fn opts() -> [getopts::opt] { type output_filenames = @{out_filename: str, obj_filename:str}; fn build_output_filenames(ifile: str, - odir: option::t<str>, - ofile: option::t<str>, + odir: option<str>, + ofile: option<str>, sess: session) -> output_filenames { let obj_path = ""; diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index 81f1c76a2c9..897e367251c 100644 --- a/src/comp/driver/session.rs +++ b/src/comp/driver/session.rs @@ -40,7 +40,7 @@ type options = time_llvm_passes: bool, output_type: back::link::output_type, addl_lib_search_paths: [str], - maybe_sysroot: option::t<str>, + maybe_sysroot: option<str>, target_triple: str, cfg: ast::crate_cfg, test: bool, @@ -58,7 +58,7 @@ type session = @{targ_cfg: @config, parse_sess: parse_sess, codemap: codemap::codemap, // For a library crate, this is always none - mutable main_fn: option::t<(node_id, codemap::span)>, + mutable main_fn: option<(node_id, codemap::span)>, span_diagnostic: diagnostic::span_handler, filesearch: filesearch::filesearch, mutable building_library: bool, |