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/util | |
| 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/util')
| -rw-r--r-- | src/comp/util/common.rs | 4 | ||||
| -rw-r--r-- | src/comp/util/filesearch.rs | 8 | ||||
| -rw-r--r-- | src/comp/util/ppaux.rs | 40 |
3 files changed, 26 insertions, 26 deletions
diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs index 8ec16de4dbe..172afa35fe9 100644 --- a/src/comp/util/common.rs +++ b/src/comp/util/common.rs @@ -73,8 +73,8 @@ fn has_nonlocal_exits(b: ast::blk) -> bool { let has_exits = @mutable false; fn visit_expr(flag: @mutable bool, e: @ast::expr) { alt e.node { - ast::expr_break. { *flag = true; } - ast::expr_cont. { *flag = true; } + ast::expr_break { *flag = true; } + ast::expr_cont { *flag = true; } _ { } } } diff --git a/src/comp/util/filesearch.rs b/src/comp/util/filesearch.rs index 906a02adec0..ece3f17e747 100644 --- a/src/comp/util/filesearch.rs +++ b/src/comp/util/filesearch.rs @@ -96,7 +96,7 @@ fn make_target_lib_path(sysroot: fs::path, fn get_default_sysroot() -> fs::path { alt os::get_exe_path() { option::some(p) { fs::normalize(fs::connect(p, "..")) } - option::none. { + option::none { fail "can't determine value for sysroot"; } } @@ -105,17 +105,17 @@ fn get_default_sysroot() -> fs::path { fn get_sysroot(maybe_sysroot: option::t<fs::path>) -> fs::path { alt maybe_sysroot { option::some(sr) { sr } - option::none. { get_default_sysroot() } + option::none { get_default_sysroot() } } } fn get_cargo_root() -> result::t<fs::path, str> { alt generic_os::getenv("CARGO_ROOT") { some(_p) { result::ok(_p) } - none. { + none { alt fs::homedir() { some(_q) { result::ok(fs::connect(_q, ".cargo")) } - none. { result::err("no CARGO_ROOT or home directory") } + none { result::err("no CARGO_ROOT or home directory") } } } } diff --git a/src/comp/util/ppaux.rs b/src/comp/util/ppaux.rs index ddab92ed861..093b9c49a74 100644 --- a/src/comp/util/ppaux.rs +++ b/src/comp/util/ppaux.rs @@ -10,11 +10,11 @@ import middle::ast_map; fn mode_str(m: ty::mode) -> str { alt m { - ast::by_ref. { "&&" } - ast::by_val. { "++" } - ast::by_mut_ref. { "&" } - ast::by_move. { "-" } - ast::by_copy. { "+" } + ast::by_ref { "&&" } + ast::by_val { "++" } + ast::by_mut_ref { "&" } + ast::by_move { "-" } + ast::by_copy { "+" } _ { "" } } } @@ -23,10 +23,10 @@ fn ty_to_str(cx: ctxt, typ: t) -> str { fn fn_input_to_str(cx: ctxt, input: {mode: middle::ty::mode, ty: t}) -> str { let modestr = alt input.mode { - ast::by_ref. { + ast::by_ref { ty::type_is_immediate(cx, input.ty) ? "&&" : "" } - ast::by_val. { + ast::by_val { ty::type_is_immediate(cx, input.ty) ? "" : "++" } _ { mode_str(input.mode) } @@ -46,7 +46,7 @@ fn ty_to_str(cx: ctxt, typ: t) -> str { if struct(cx, output) != ty_nil { s += " -> "; alt cf { - ast::noreturn. { s += "!"; } + ast::noreturn { s += "!"; } ast::return_val. { s += ty_to_str(cx, output); } } } @@ -63,9 +63,9 @@ fn ty_to_str(cx: ctxt, typ: t) -> str { fn mt_to_str(cx: ctxt, m: mt) -> str { let mstr; alt m.mut { - ast::mut. { mstr = "mutable "; } - ast::imm. { mstr = ""; } - ast::maybe_mut. { mstr = "const "; } + ast::mut { mstr = "mutable "; } + ast::imm { mstr = ""; } + ast::maybe_mut { mstr = "const "; } } ret mstr + ty_to_str(cx, m.ty); } @@ -86,22 +86,22 @@ fn ty_to_str(cx: ctxt, typ: t) -> str { } ret alt struct(cx, typ) { ty_native(_) { "native" } - ty_nil. { "()" } - ty_bot. { "_|_" } - ty_bool. { "bool" } - ty_int(ast::ty_i.) { "int" } - ty_int(ast::ty_char.) { "char" } + ty_nil { "()" } + ty_bot { "_|_" } + ty_bool { "bool" } + ty_int(ast::ty_i) { "int" } + ty_int(ast::ty_char) { "char" } ty_int(t) { ast_util::int_ty_to_str(t) } - ty_uint(ast::ty_u.) { "uint" } + ty_uint(ast::ty_u) { "uint" } ty_uint(t) { ast_util::uint_ty_to_str(t) } - ty_float(ast::ty_f.) { "float" } + ty_float(ast::ty_f) { "float" } ty_float(t) { ast_util::float_ty_to_str(t) } - ty_str. { "str" } + ty_str { "str" } ty_box(tm) { "@" + mt_to_str(cx, tm) } ty_uniq(tm) { "~" + mt_to_str(cx, tm) } ty_ptr(tm) { "*" + mt_to_str(cx, tm) } ty_vec(tm) { "[" + mt_to_str(cx, tm) + "]" } - ty_type. { "type" } + ty_type { "type" } ty_rec(elems) { let strs: [str] = []; for fld: field in elems { strs += [field_to_str(cx, fld)]; } |
