5 files changed, 19 insertions, 19 deletions

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 1193fa81131..1747147ea51 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -85,7 +85,7 @@ fn log_config(config: config) {
 }
 
 fn opt_str(maybestr: option::t<str>) -> str {
-    alt maybestr { option::some(s) { s } option::none. { "(none)" } }
+    alt maybestr { option::some(s) { s } option::none { "(none)" } }
 }
 
 fn str_opt(maybestr: str) -> option::t<str> {
@@ -104,10 +104,10 @@ fn str_mode(s: str) -> mode {
 
 fn mode_str(mode: mode) -> str {
     alt mode {
-      mode_compile_fail. { "compile-fail" }
-      mode_run_fail. { "run-fail" }
-      mode_run_pass. { "run-pass" }
-      mode_pretty. { "pretty" }
+      mode_compile_fail { "compile-fail" }
+      mode_run_fail { "run-fail" }
+      mode_run_pass { "run-pass" }
+      mode_pretty { "pretty" }
     }
 }
 
@@ -124,7 +124,7 @@ fn test_opts(config: config) -> test::test_opts {
     {filter:
          alt config.filter {
            option::some(s) { option::some(s) }
-           option::none. { option::none }
+           option::none { option::none }
          },
      run_ignored: config.run_ignored}
 }
@@ -151,7 +151,7 @@ fn make_tests(cx: cx) -> tests_and_conv_fn {
 fn is_test(config: config, testfile: str) -> bool {
     // Pretty-printer does not work with .rc files yet
     let valid_extensions =
-        alt config.mode { mode_pretty. { [".rs"] } _ { [".rc", ".rs"] } };
+        alt config.mode { mode_pretty { [".rs"] } _ { [".rc", ".rs"] } };
     let invalid_prefixes = [".", "#", "~"];
     let name = fs::basename(testfile);
 
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index b7ff47c89e7..cccce3e5f1b 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -28,7 +28,7 @@ fn load_props(testfile: str) -> test_props {
     iter_header(testfile) {|ln|
         alt parse_error_pattern(ln) {
           option::some(ep) { error_patterns += [ep]; }
-          option::none. { }
+          option::none { }
         };
 
         if option::is_none(compile_flags) {
@@ -89,7 +89,7 @@ fn parse_compile_flags(line: str) -> option::t<str> {
 fn parse_pp_exact(line: str, testfile: str) -> option::t<str> {
     alt parse_name_value_directive(line, "pp-exact") {
       option::some(s) { option::some(s) }
-      option::none. {
+      option::none {
         if parse_name_directive(line, "pp-exact") {
             option::some(fs::basename(testfile))
         } else {
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 14604fbd1d4..c74f264f2b0 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -119,7 +119,7 @@ fn worker(p: port<request>) {
                      args: clone_vecu8str(args),
                      respchan: respchan}
                   }
-                  stop. { ret }
+                  stop { ret }
                 }
             };
 
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 44679602683..73064d1adf5 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -24,10 +24,10 @@ fn run(cx: cx, -_testfile: [u8]) {
     #debug("running %s", testfile);
     let props = load_props(testfile);
     alt cx.config.mode {
-      mode_compile_fail. { run_cfail_test(cx, props, testfile); }
-      mode_run_fail. { run_rfail_test(cx, props, testfile); }
-      mode_run_pass. { run_rpass_test(cx, props, testfile); }
-      mode_pretty. { run_pretty_test(cx, props, testfile); }
+      mode_compile_fail { run_cfail_test(cx, props, testfile); }
+      mode_run_fail { run_rfail_test(cx, props, testfile); }
+      mode_run_pass { run_rpass_test(cx, props, testfile); }
+      mode_pretty { run_pretty_test(cx, props, testfile); }
     }
 }
 
@@ -96,7 +96,7 @@ fn run_pretty_test(cx: cx, props: test_props, testfile: str) {
     } else { logv(cx.config, "testing for converging pretty-printing"); }
 
     let rounds =
-        alt props.pp_exact { option::some(_) { 1 } option::none. { 2 } };
+        alt props.pp_exact { option::some(_) { 1 } option::none { 2 } };
 
     let srcs = [result::get(io::read_whole_file_str(testfile))];
 
@@ -120,7 +120,7 @@ fn run_pretty_test(cx: cx, props: test_props, testfile: str) {
             let filepath = fs::connect(fs::dirname(testfile), file);
             result::get(io::read_whole_file_str(filepath))
           }
-          option::none. { srcs[vec::len(srcs) - 2u] }
+          option::none { srcs[vec::len(srcs) - 2u] }
         };
     let actual = srcs[vec::len(srcs) - 1u];
 
@@ -326,7 +326,7 @@ fn make_run_args(config: config, _props: test_props, testfile: str) ->
             let runtool =
                 alt config.runtool {
                   option::some(s) { option::some(s) }
-                  option::none. { option::none }
+                  option::none { option::none }
                 };
             split_maybe_args(runtool)
         };
@@ -351,7 +351,7 @@ fn split_maybe_args(argstr: option::t<str>) -> [str] {
 
     alt argstr {
       option::some(s) { rm_whitespace(str::split(s, ' ' as u8)) }
-      option::none. { [] }
+      option::none { [] }
     }
 }
 
diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs
index e2943f35fc4..c18dad3b22a 100644
--- a/src/compiletest/util.rs
+++ b/src/compiletest/util.rs
@@ -12,7 +12,7 @@ fn make_new_path(path: str) -> str {
       option::some(curr) {
         #fmt["%s%s%s", path, path_div(), curr]
       }
-      option::none. { path }
+      option::none { path }
     }
 }