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).

5 files changed, 18 insertions, 18 deletions

diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs
index bf56dea642b..bb5e629ef62 100644
--- a/src/compiletest/common.rs
+++ b/src/compiletest/common.rs
@@ -24,9 +24,9 @@ type config =
      stage_id: str,
      mode: mode,
      run_ignored: bool,
-     filter: option::t<str>,
-     runtool: option::t<str>,
-     rustcflags: option::t<str>,
+     filter: option<str>,
+     runtool: option<str>,
+     rustcflags: option<str>,
      verbose: bool};
 
 type cx = {config: config, procsrv: procsrv::handle};
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index a86a94547f7..32f8762577f 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -84,11 +84,11 @@ fn log_config(config: config) {
     logv(c, #fmt["\n"]);
 }
 
-fn opt_str(maybestr: option::t<str>) -> str {
+fn opt_str(maybestr: option<str>) -> str {
     alt maybestr { option::some(s) { s } option::none { "(none)" } }
 }
 
-fn str_opt(maybestr: str) -> option::t<str> {
+fn str_opt(maybestr: str) -> option<str> {
     if maybestr != "(none)" { option::some(maybestr) } else { option::none }
 }
 
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index 71968abdd6d..ec881caebbc 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -14,10 +14,10 @@ type test_props = {
     // Lines that should be expected, in order, on standard out
     error_patterns: [str],
     // Extra flags to pass to the compiler
-    compile_flags: option::t<str>,
+    compile_flags: option<str>,
     // If present, the name of a file that this test should match when
     // pretty-printed
-    pp_exact: option::t<str>
+    pp_exact: option<str>
 };
 
 // Load any test directives embedded in the file
@@ -78,15 +78,15 @@ fn iter_header(testfile: str, it: fn(str)) {
     }
 }
 
-fn parse_error_pattern(line: str) -> option::t<str> {
+fn parse_error_pattern(line: str) -> option<str> {
     parse_name_value_directive(line, "error-pattern")
 }
 
-fn parse_compile_flags(line: str) -> option::t<str> {
+fn parse_compile_flags(line: str) -> option<str> {
     parse_name_value_directive(line, "compile-flags")
 }
 
-fn parse_pp_exact(line: str, testfile: str) -> option::t<str> {
+fn parse_pp_exact(line: str, testfile: str) -> option<str> {
     alt parse_name_value_directive(line, "pp-exact") {
       option::some(s) { option::some(s) }
       option::none {
@@ -104,7 +104,7 @@ fn parse_name_directive(line: str, directive: str) -> bool {
 }
 
 fn parse_name_value_directive(line: str,
-                              directive: str) -> option::t<str> {
+                              directive: str) -> option<str> {
     let keycolon = directive + ":";
     if str::find(line, keycolon) >= 0 {
         let colon = str::find(line, keycolon) as uint;
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 6f3fd87466a..4d01d299548 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -26,7 +26,7 @@ export reqchan;
 type reqchan = chan<request>;
 
 type handle =
-    {task: option::t<(task::task, port<task::task_notification>)>,
+    {task: option<(task::task, port<task::task_notification>)>,
      chan: reqchan};
 
 enum request { exec([u8], [u8], [[u8]], chan<response>), stop, }
@@ -54,7 +54,7 @@ fn close(handle: handle) {
 }
 
 fn run(handle: handle, lib_path: str, prog: str, args: [str],
-       input: option::t<str>) -> {status: int, out: str, err: str} {
+       input: option<str>) -> {status: int, out: str, err: str} {
     let p = port();
     let ch = chan(p);
     send(handle.chan,
@@ -69,7 +69,7 @@ fn run(handle: handle, lib_path: str, prog: str, args: [str],
     ret {status: status, out: output, err: errput};
 }
 
-fn writeclose(fd: fd_t, s: option::t<str>) {
+fn writeclose(fd: fd_t, s: option<str>) {
     if option::is_some(s) {
         let writer = io::fd_writer(fd, false);
         writer.write_str(option::get(s));
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index d3d02f08977..a3920ccb184 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -298,7 +298,7 @@ fn exec_compiled_test(cx: cx, props: test_props, testfile: str) -> procres {
 
 fn compose_and_run(cx: cx, testfile: str,
                    make_args: fn@(config, str) -> procargs, lib_path: str,
-                   input: option::t<str>) -> procres {
+                   input: option<str>) -> procres {
     let procargs = make_args(cx.config, testfile);
     ret program_output(cx, testfile, lib_path, procargs.prog, procargs.args,
                        input);
@@ -334,9 +334,9 @@ fn make_run_args(config: config, _props: test_props, testfile: str) ->
     ret {prog: args[0], args: vec::slice(args, 1u, vec::len(args))};
 }
 
-fn split_maybe_args(argstr: option::t<str>) -> [str] {
+fn split_maybe_args(argstr: option<str>) -> [str] {
     fn rm_whitespace(v: [str]) -> [str] {
-        fn flt(&&s: str) -> option::t<str> {
+        fn flt(&&s: str) -> option<str> {
             if !is_whitespace(s) { option::some(s) } else { option::none }
         }
 
@@ -355,7 +355,7 @@ fn split_maybe_args(argstr: option::t<str>) -> [str] {
 }
 
 fn program_output(cx: cx, testfile: str, lib_path: str, prog: str,
-                  args: [str], input: option::t<str>) -> procres {
+                  args: [str], input: option<str>) -> procres {
     let cmdline =
         {
             let cmdline = make_cmdline(lib_path, prog, args);