diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-01-18 22:37:22 -0800 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-01-18 23:17:34 -0800 |
| commit | 04a2887f8791bb080b4e76a55949a7c1954dbb97 (patch) | |
| tree | f072b2cc1e0b41270041a3a10a4fc313d3fa1a89 /src/comp/back | |
| parent | ca7cfbe3d0251766217e5d4e559903e655e7549b (diff) | |
| download | rust-04a2887f8791bb080b4e76a55949a7c1954dbb97.tar.gz rust-04a2887f8791bb080b4e76a55949a7c1954dbb97.zip | |
Remove '.' after nullary tags in patterns
Does what it says on the tin. The next commit will remove support for this syntax.
Diffstat (limited to 'src/comp/back')
| -rw-r--r-- | src/comp/back/link.rs | 18 | ||||
| -rw-r--r-- | src/comp/back/x86.rs | 24 | ||||
| -rw-r--r-- | src/comp/back/x86_64.rs | 24 |
3 files changed, 33 insertions, 33 deletions
diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index d8ac301a8f4..a4c35178e3e 100644 --- a/src/comp/back/link.rs +++ b/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); } diff --git a/src/comp/back/x86.rs b/src/comp/back/x86.rs index 6e668b4c967..898b1cad70e 100644 --- a/src/comp/back/x86.rs +++ b/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"] diff --git a/src/comp/back/x86_64.rs b/src/comp/back/x86_64.rs index b02910be489..ca10a798cdb 100644 --- a/src/comp/back/x86_64.rs +++ b/src/comp/back/x86_64.rs @@ -5,33 +5,33 @@ 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" @@ -39,10 +39,10 @@ fn get_target_strs(target_os: session::os) -> target_strs::t { }, 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"] |
