Remove '.' after nullary tags in patterns

Does what it says on the tin.

The next commit will remove support for this syntax.

Author: catamorphism

src/cargo/cargo.rs

@@ -417,7 +417,7 @@ fn install_source(c: cargo, path: str) {
     for cf: str in cratefiles {
         let p = load_pkg(cf);
         alt p {
-            none. { cont; }
+            none { cont; }
             some(_p) {
                 if c.test {
                     test_one_crate(c, path, cf, _p);
@@ -559,7 +559,7 @@ fn cmd_install(c: cargo, argv: [str]) {
 
     let wd = alt tempfile::mkdtemp(c.workdir + fs::path_sep(), "") {
         some(_wd) { _wd }
-        none. { fail "needed temp dir"; }
+        none { fail "needed temp dir"; }
     };
 
     if str::starts_with(target, "uuid:") {

src/comp/back/link.rs

@@ -43,7 +43,7 @@ fn load_intrinsics_bc(sess: session) -> option::t<ModuleRef> {
         sess.filesearch,
         bind filesearch::pick_file("intrinsics.bc", _)) {
       option::some(path) { path }
-      option::none. {
+      option::none {
         sess.warn("couldn't find intrinsics.bc");
         ret option::none;
       }
@@ -70,7 +70,7 @@ fn load_intrinsics_ll(sess: session) -> ModuleRef {
         sess.filesearch,
         bind filesearch::pick_file("intrinsics.ll", _)) {
       option::some(path) { path }
-      option::none. { sess.fatal("couldn't find intrinsics.ll") }
+      option::none { sess.fatal("couldn't find intrinsics.ll") }
     };
     let llintrinsicsmod = str::as_buf(path, { |buf|
         llvm::LLVMRustParseAssemblyFile(buf)
@@ -86,7 +86,7 @@ fn link_intrinsics(sess: session, llmod: ModuleRef) {
     let llintrinsicsmod = {
         alt load_intrinsics_bc(sess) {
           option::some(m) { m }
-          option::none. {
+          option::none {
             // When the bitcode format changes we can't parse a .bc
             // file produced with a newer LLVM (as happens when stage0
             // is trying to build against a new LLVM revision), in
@@ -139,7 +139,7 @@ mod write {
 
         if opts.save_temps {
             alt opts.output_type {
-              output_type_bitcode. {
+              output_type_bitcode {
                 if opts.optimize != 0u {
                     let filename = mk_intermediate_name(output, "no-opt.bc");
                     str::as_buf(filename,
@@ -383,12 +383,12 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
             if attr::get_meta_item_name(meta) == "name" {
                 alt attr::get_meta_item_value_str(meta) {
                   some(v) { name = some(v); }
-                  none. { cmh_items += [meta]; }
+                  none { cmh_items += [meta]; }
                 }
             } else if attr::get_meta_item_name(meta) == "vers" {
                 alt attr::get_meta_item_value_str(meta) {
                   some(v) { vers = some(v); }
-                  none. { cmh_items += [meta]; }
+                  none { cmh_items += [meta]; }
                 }
             } else { cmh_items += [meta]; }
         }
@@ -442,7 +442,7 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
                        output: str, metas: provided_metas) -> str {
         ret alt metas.name {
               some(v) { v }
-              none. {
+              none {
                 let name =
                     {
                         let os = str::split(fs::basename(output), '.' as u8);
@@ -463,7 +463,7 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
                        metas: provided_metas) -> str {
         ret alt metas.vers {
               some(v) { v }
-              none. {
+              none {
                 let vers = "0.0";
                 warn_missing(sess, "vers", vers);
                 vers
@@ -509,7 +509,7 @@ fn get_symbol_hash(ccx: @crate_ctxt, t: ty::t) -> str {
     let hash = "";
     alt ccx.type_sha1s.find(t) {
       some(h) { hash = h; }
-      none. {
+      none {
         hash = symbol_hash(ccx.tcx, ccx.sha, t, ccx.link_meta);
         ccx.type_sha1s.insert(t, hash);
       }

src/comp/back/x86.rs

@@ -5,37 +5,37 @@ fn get_target_strs(target_os: session::os) -> target_strs::t {
         module_asm: "",
 
         meta_sect_name: alt target_os {
-          session::os_macos. { "__DATA,__note.rustc" }
-          session::os_win32. { ".note.rustc" }
-          session::os_linux. { ".note.rustc" }
-          session::os_freebsd. { ".note.rustc" }
+          session::os_macos { "__DATA,__note.rustc" }
+          session::os_win32 { ".note.rustc" }
+          session::os_linux { ".note.rustc" }
+          session::os_freebsd { ".note.rustc" }
         },
 
         data_layout: alt target_os {
-          session::os_macos. {
+          session::os_macos {
             "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16" + "-i32:32:32-i64:32:64" +
                 "-f32:32:32-f64:32:64-v64:64:64" +
               "-v128:128:128-a0:0:64-f80:128:128" + "-n8:16:32"
           }
 
-          session::os_win32. {
+          session::os_win32 {
             "e-p:32:32-f64:64:64-i64:64:64-f80:32:32-n8:16:32"
           }
 
-          session::os_linux. {
+          session::os_linux {
             "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32"
           }
 
-          session::os_freebsd. {
+          session::os_freebsd {
             "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32"
           }
         },
 
         target_triple: alt target_os {
-          session::os_macos. { "i686-apple-darwin" }
-          session::os_win32. { "i686-pc-mingw32" }
-          session::os_linux. { "i686-unknown-linux-gnu" }
-          session::os_freebsd. { "i686-unknown-freebsd" }
+          session::os_macos { "i686-apple-darwin" }
+          session::os_win32 { "i686-pc-mingw32" }
+          session::os_linux { "i686-unknown-linux-gnu" }
+          session::os_freebsd { "i686-unknown-freebsd" }
         },
 
         gcc_args: ["-m32"]

src/comp/back/x86_64.rs

@@ -5,44 +5,44 @@ fn get_target_strs(target_os: session::os) -> target_strs::t {
         module_asm: "",
 
         meta_sect_name: alt target_os {
-          session::os_macos. { "__DATA,__note.rustc" }
-          session::os_win32. { ".note.rustc" }
-          session::os_linux. { ".note.rustc" }
-          session::os_freebsd. { ".note.rustc" }
+          session::os_macos { "__DATA,__note.rustc" }
+          session::os_win32 { ".note.rustc" }
+          session::os_linux { ".note.rustc" }
+          session::os_freebsd { ".note.rustc" }
         },
 
         data_layout: alt target_os {
-          session::os_macos. {
+          session::os_macos {
             "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"+
                 "f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-"+
                 "s0:64:64-f80:128:128-n8:16:32:64"
           }
 
-          session::os_win32. {
+          session::os_win32 {
             // FIXME: Test this. Copied from linux
             "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"+
                 "f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-"+
                 "s0:64:64-f80:128:128-n8:16:32:64-S128"
           }
 
-          session::os_linux. {
+          session::os_linux {
             "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"+
                 "f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-"+
                 "s0:64:64-f80:128:128-n8:16:32:64-S128"
           }
 
-          session::os_freebsd. {
+          session::os_freebsd {
             "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"+
                 "f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-"+
                 "s0:64:64-f80:128:128-n8:16:32:64-S128"
           }
         },
 
         target_triple: alt target_os {
-          session::os_macos. { "x86_64-apple-darwin" }
-          session::os_win32. { "x86_64-pc-mingw32" }
-          session::os_linux. { "x86_64-unknown-linux-gnu" }
-          session::os_freebsd. { "x86_64-unknown-freebsd" }
+          session::os_macos { "x86_64-apple-darwin" }
+          session::os_win32 { "x86_64-pc-mingw32" }
+          session::os_linux { "x86_64-unknown-linux-gnu" }
+          session::os_freebsd { "x86_64-unknown-freebsd" }
         },
 
         gcc_args: ["-m64"]

src/comp/driver/diagnostic.rs

@@ -91,7 +91,7 @@ fn mk_handler(cm: codemap::codemap,
 
     let emit = alt emitter {
       some(e) { e }
-      none. {
+      none {
         let f = fn@(cmsp: option<(codemap::codemap, span)>,
             msg: str, t: level) {
             emit(cmsp, msg, t);
@@ -116,19 +116,19 @@ tag level {
 
 fn diagnosticstr(lvl: level) -> str {
     alt lvl {
-      fatal. { "error" }
-      error. { "error" }
-      warning. { "warning" }
-      note. { "note" }
+      fatal { "error" }
+      error { "error" }
+      warning { "warning" }
+      note { "note" }
     }
 }
 
 fn diagnosticcolor(lvl: level) -> u8 {
     alt lvl {
-      fatal. { term::color_bright_red }
-      error. { term::color_bright_red }
-      warning. { term::color_bright_yellow }
-      note. { term::color_bright_green }
+      fatal { term::color_bright_red }
+      error { term::color_bright_red }
+      warning { term::color_bright_yellow }
+      note { term::color_bright_green }
     }
 }
 
@@ -155,7 +155,7 @@ fn emit(cmsp: option<(codemap::codemap, span)>,
         print_diagnostic(ss, lvl, msg);
         highlight_lines(cm, sp, lines);
       }
-      none. {
+      none {
         print_diagnostic("", lvl, msg);
       }
     }

src/comp/driver/driver.rs

@@ -280,22 +280,22 @@ fn pretty_print_input(sess: session, cfg: ast::crate_cfg, input: str,
     // from stdin, we're going to just suck the source into a string
     // so both the parser and pretty-printer can use it.
     let upto = alt ppm {
-      ppm_expanded. { cu_expand }
-      ppm_typed. { cu_typeck }
+      ppm_expanded { cu_expand }
+      ppm_typed { cu_typeck }
       _ { cu_parse }
     };
     let {crate, tcx, src} = compile_upto(sess, cfg, input, upto, none);
 
     let ann: pprust::pp_ann = pprust::no_ann();
     alt ppm {
-      ppm_typed. {
+      ppm_typed {
         ann = {pre: ann_paren_for_expr,
                post: bind ann_typed_post(option::get(tcx), _)};
       }
-      ppm_identified. {
+      ppm_identified {
         ann = {pre: ann_paren_for_expr, post: ann_identified_post};
       }
-      ppm_expanded. | ppm_normal. {}
+      ppm_expanded | ppm_normal {}
     }
     pprust::print_crate(sess.codemap, sess.diagnostic, crate, input,
                         io::string_reader(src), io::stdout(), ann);
@@ -332,11 +332,11 @@ fn build_target_config(sopts: @session::options,
                        demitter: diagnostic::emitter) -> @session::config {
     let os = alt get_os(sopts.target_triple) {
       some(os) { os }
-      none. { early_error(demitter, "Unknown operating system!") }
+      none { early_error(demitter, "Unknown operating system!") }
     };
     let arch = alt get_arch(sopts.target_triple) {
       some(arch) { arch }
-      none. { early_error(demitter,
+      none { early_error(demitter,
                           "Unknown architecture! " + sopts.target_triple) }
     };
     let (int_type, uint_type, float_type) = alt arch {
@@ -429,7 +429,7 @@ fn build_session_options(match: getopts::match,
         } else { 0u };
     let target =
         alt target_opt {
-            none. { host_triple() }
+            none { host_triple() }
             some(s) { s }
         };
 
@@ -538,8 +538,8 @@ fn build_output_filenames(ifile: str,
 
     let obj_suffix =
         alt sopts.output_type {
-          link::output_type_none. { "none" }
-          link::output_type_bitcode. { "bc" }
+          link::output_type_none { "none" }
+          link::output_type_bitcode { "bc" }
           link::output_type_assembly. { "s" }
           link::output_type_llvm_assembly. { "ll" }
           // Object and exe output both use the '.o' extension here
@@ -549,13 +549,13 @@ fn build_output_filenames(ifile: str,
         };
 
     alt ofile {
-      none. {
+      none {
         // "-" as input file will cause the parser to read from stdin so we
         // have to make up a name
         // We want to toss everything after the final '.'
         let dirname = alt odir {
           some(d) { d }
-          none. {
+          none {
             if input_is_stdin(ifile) {
                 std::os::getcwd()
             } else {

src/comp/driver/session.rs

@@ -114,9 +114,9 @@ impl session for session {
 fn building_library(req_crate_type: crate_type, crate: @ast::crate,
                     testing: bool) -> bool {
     alt req_crate_type {
-      bin_crate. { false }
-      lib_crate. { true }
-      unknown_crate. {
+      bin_crate { false }
+      lib_crate { true }
+      unknown_crate {
         if testing {
             false
         } else {

src/comp/front/attr.rs

@@ -202,7 +202,7 @@ fn require_unique_names(sess: session, metas: [@ast::meta_item]) {
 
 fn native_abi(attrs: [ast::attribute]) -> either::t<str, ast::native_abi> {
     ret alt attr::get_meta_item_value_str_by_name(attrs, "abi") {
-      option::none. {
+      option::none {
         either::right(ast::native_abi_cdecl)
       }
       option::some("rust-intrinsic") {
@@ -236,10 +236,10 @@ fn meta_item_value_from_list(
       some(item) {
         alt attr::get_meta_item_value_str(item) {
           some(value) { some(value) }
-          none. { none }
+          none { none }
         }
       }
-      none. { none }
+      none { none }
     }
 }
 
@@ -251,7 +251,7 @@ fn meta_item_list_from_list(
       some(item) {
         attr::get_meta_item_list(item)
       }
-      none. { none }
+      none { none }
     }
 }
 
@@ -263,7 +263,7 @@ fn name_value_str_pair(
         let name = attr::get_meta_item_name(item);
         some((name, value))
       }
-      none. { none }
+      none { none }
     }
 }