Skip to content

Commit 81fc2d8

Browse files
brsonbrson
committed
rustc: Remove unneeded type params from alt patterns
1 parent ed0eb8f commit 81fc2d8

File tree

18 files changed

+271
-271
lines changed

18 files changed

+271
-271
lines changed

‎src/comp/driver/rustc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ fn build_session_options(str binary, getopts::match match)
272272
};
273273

274274
auto sysroot = alt (sysroot_opt) {
275-
case (none[str]) { get_default_sysroot(binary) }
276-
case (some[str](?s)) { s }
275+
case (none) { get_default_sysroot(binary) }
276+
case (some(?s)) { s }
277277
};
278278

279279
let @session::options sopts =
@@ -376,7 +376,7 @@ fn main(vec[str] args) {
376376
ret;
377377
} else {
378378
alt (output_file) {
379-
case (none[str]) {
379+
case (none) {
380380
let vec[str] parts = str::split(ifile, '.' as u8);
381381
vec::pop[str](parts);
382382
saved_out_filename = parts.(0);
@@ -392,7 +392,7 @@ fn main(vec[str] args) {
392392
auto ofile = str::connect(parts, ".");
393393
compile_input(sess, env, ifile, ofile);
394394
}
395-
case (some[str](?ofile)) {
395+
case (some(?ofile)) {
396396
saved_out_filename = ofile;
397397
compile_input(sess, env, ifile, ofile);
398398
}

‎src/comp/front/creader.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ fn parse_ty(@pstate st, str_def sd) -> ty::t {
182182
auto len = parse_hex(st);
183183
assert (next(st) as char == '#');
184184
alt (st.tcx.rcache.find(tup(st.crate,pos,len))) {
185-
case (some[ty::t](?tt)) { ret tt; }
186-
case (none[ty::t]) {
185+
case (some(?tt)) { ret tt; }
186+
case (none) {
187187
auto ps = @rec(pos=pos, len=len with *st);
188188
auto tt = parse_ty(ps, sd);
189189
st.tcx.rcache.insert(tup(st.crate,pos,len), tt);
@@ -262,10 +262,10 @@ fn parse_ty_fn(@pstate st, str_def sd) -> tup(vec[ty::arg], ty::t,
262262
st.pos = st.pos + 1u;
263263
auto res = parse_ty_or_bang(st, sd);
264264
alt (res) {
265-
case (a_bang[ty::t]) {
265+
case (a_bang) {
266266
ret tup(inputs, ty::mk_bot(st.tcx), ast::noreturn);
267267
}
268-
case (a_ty[ty::t](?t)) {
268+
case (a_ty(?t)) {
269269
ret tup(inputs, t, ast::return);
270270
}
271271
}
@@ -434,7 +434,7 @@ fn load_crate(session::session sess,
434434
for (str library_search_path in library_search_paths) {
435435
auto path = fs::connect(library_search_path, filename);
436436
alt (get_metadata_section(path)) {
437-
case (option::some[vec[u8]](?cvec)) {
437+
case (option::some(?cvec)) {
438438
sess.set_external_crate(cnum, rec(name=ident, data=cvec));
439439
ret;
440440
}
@@ -594,10 +594,10 @@ fn get_tag_variants(ty::ctxt tcx, ast::def_id def)
594594

595595
fn list_file_metadata(str path, io::writer out) {
596596
alt (get_metadata_section(path)) {
597-
case (option::some[vec[u8]](?bytes)) {
597+
case (option::some(?bytes)) {
598598
list_crate_metadata(bytes, out);
599599
}
600-
case (option::none[vec[u8]]) {
600+
case (option::none) {
601601
out.write_str("Could not find metadata in " + path + ".\n");
602602
}
603603
}

‎src/comp/front/eval.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ fn eval_crate_directive_expr(ctx cx,
300300
}
301301

302302
alt (elopt) {
303-
case (some[@ast::expr](?els)) {
303+
case (some(?els)) {
304304
ret eval_crate_directive_expr(cx, e, els, prefix,
305305
view_items, items);
306306
}
@@ -370,10 +370,10 @@ fn eval_crate_directive(ctx cx,
370370

371371
auto file_path = id + ".rs";
372372
alt (file_opt) {
373-
case (some[filename](?f)) {
373+
case (some(?f)) {
374374
file_path = f;
375375
}
376-
case (none[filename]) {}
376+
case (none) {}
377377
}
378378

379379
auto full_path = prefix + std::fs::path_sep() + file_path;
@@ -401,10 +401,10 @@ fn eval_crate_directive(ctx cx,
401401

402402
auto path = id;
403403
alt (dir_opt) {
404-
case (some[filename](?d)) {
404+
case (some(?d)) {
405405
path = d;
406406
}
407-
case (none[filename]) {}
407+
case (none) {}
408408
}
409409

410410
auto full_path = prefix + std::fs::path_sep() + path;

‎src/comp/front/extenv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ fn expand_syntax_ext(parser::parser p,
2828

2929
auto var = expr_to_str(p, args.(0));
3030
alt (generic_os::getenv(var)) {
31-
case (option::none[str]) {
31+
case (option::none) {
3232
ret make_new_str(p, sp, "");
3333
}
34-
case (option::some[str](?s)) {
34+
case (option::some(?s)) {
3535
ret make_new_str(p, sp, s);
3636
}
3737
}

‎src/comp/front/extfmt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ fn pieces_to_expr(parser p, vec[piece] pieces, vec[@ast::expr] args)
313313
auto unsupported = "conversion not supported in #fmt string";
314314

315315
alt (cnv.param) {
316-
case (option::none[int]) {
316+
case (option::none) {
317317
}
318318
case (_) {
319319
log_err unsupported;
@@ -407,7 +407,7 @@ fn pieces_to_expr(parser p, vec[piece] pieces, vec[@ast::expr] args)
407407

408408
fn log_conv(conv c) {
409409
alt (c.param) {
410-
case (some[int](?p)) {
410+
case (some(?p)) {
411411
log "param: " + std::int::to_str(p, 10u);
412412
}
413413
case (_) {

‎src/comp/front/lexer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,10 @@ fn scan_number(char c, &reader rdr) -> token::token {
367367
c = rdr.curr();
368368
auto exponent_str = scan_exponent(rdr);
369369
alt (exponent_str) {
370-
case (some[str](?s)) {
370+
case (some(?s)) {
371371
float_str += s;
372372
}
373-
case (none[str]) {
373+
case (none) {
374374
}
375375
}
376376

@@ -400,11 +400,11 @@ fn scan_number(char c, &reader rdr) -> token::token {
400400

401401
auto maybe_exponent = scan_exponent(rdr);
402402
alt(maybe_exponent) {
403-
case(some[str](?s)) {
403+
case(some(?s)) {
404404
ret token::LIT_FLOAT(interner::intern[str](*rdr.get_interner(),
405405
dec_str + s));
406406
}
407-
case(none[str]) {
407+
case(none) {
408408
ret token::LIT_INT(accum_int);
409409
}
410410
}

‎src/comp/front/parser.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,10 @@ fn parse_ty_fn(ast::proto proto, &parser p, uint lo)
352352
p.bump();
353353
auto tmp = parse_ty_or_bang(p);
354354
alt (tmp) {
355-
case (a_ty[@ast::ty](?t)) {
355+
case (a_ty(?t)) {
356356
output = t;
357357
}
358-
case (a_bang[@ast::ty]) {
358+
case (a_bang) {
359359
output = @spanned(lo, inputs.span.hi, ast::ty_bot);
360360
cf = ast::noreturn;
361361
}
@@ -602,7 +602,7 @@ fn parse_seq_to_end[T](token::token ket,
602602
let vec[T] v = [];
603603
while (p.peek() != ket) {
604604
alt(sep) {
605-
case (some[token::token](?t)) {
605+
case (some(?t)) {
606606
if (first) {
607607
first = false;
608608
} else {
@@ -1666,7 +1666,7 @@ fn parse_block(&parser p) -> ast::block {
16661666
case (_) {
16671667
auto stmt = parse_stmt(p);
16681668
alt (stmt_to_expr(stmt)) {
1669-
case (some[@ast::expr](?e)) {
1669+
case (some(?e)) {
16701670
alt (p.peek()) {
16711671
case (token::SEMI) {
16721672
p.bump();
@@ -1684,7 +1684,7 @@ fn parse_block(&parser p) -> ast::block {
16841684
}
16851685
}
16861686
}
1687-
case (none[@ast::expr]) {
1687+
case (none) {
16881688
// Not an expression statement.
16891689
stmts += [stmt];
16901690
// FIXME: crazy differentiation between conditions
@@ -1748,11 +1748,11 @@ fn parse_fn_decl(&parser p, ast::purity purity) -> ast::fn_decl {
17481748
}
17491749

17501750
alt (res) {
1751-
case (a_ty[@ast::ty](?t)) {
1751+
case (a_ty(?t)) {
17521752
ret rec(inputs=inputs.node, output=t,
17531753
purity=purity, cf=ast::return);
17541754
}
1755-
case (a_bang[@ast::ty]) {
1755+
case (a_bang) {
17561756
ret rec(inputs=inputs.node,
17571757
output=@spanned(p.get_lo_pos(),
17581758
p.get_hi_pos(), ast::ty_bot),
@@ -2218,7 +2218,7 @@ fn parse_rest_import_name(&parser p, ast::ident first,
22182218
auto hi = p.get_hi_pos();
22192219
auto import_decl;
22202220
alt (def_ident) {
2221-
case(some[ast::ident](?i)) {
2221+
case(some(?i)) {
22222222
if (glob) {
22232223
p.err("globbed imports can't be renamed");
22242224
}

‎src/comp/middle/metadata.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ mod Encode {
8383
case (ac_no_abbrevs) {
8484
auto result_str;
8585
alt (cx.tcx.short_names_cache.find(t)) {
86-
case (some[str](?s)) { result_str = s; }
87-
case (none[str]) {
86+
case (some(?s)) { result_str = s; }
87+
case (none) {
8888
auto sw = io::string_writer();
8989
enc_sty(sw.get_writer(), cx, ty::struct(cx.tcx, t));
9090
result_str = sw.get_str();
@@ -95,11 +95,11 @@ mod Encode {
9595
}
9696
case (ac_use_abbrevs(?abbrevs)) {
9797
alt (abbrevs.find(t)) {
98-
case (some[ty_abbrev](?a)) {
98+
case (some(?a)) {
9999
w.write_str(a.s);
100100
ret;
101101
}
102-
case (none[ty_abbrev]) {
102+
case (none) {
103103
auto pos = w.get_buf_writer().tell();
104104
auto ss = enc_sty(w, cx, ty::struct(cx.tcx, t));
105105
auto end = w.get_buf_writer().tell();

‎src/comp/middle/resolve.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ fn map_crate(&@env e, &ast::crate c) {
208208
fn link_glob(@env e, @mutable list[scope] sc, &@ast::view_item vi) {
209209
fn find_mod(@env e, list[scope] sc) -> @indexed_mod {
210210
alt (sc) {
211-
case (cons[scope](scope_item(?i), ?tl)) {
211+
case (cons(scope_item(?i), ?tl)) {
212212
alt(i.node) {
213213
case (ast::item_mod(_, _, ?defid)) {
214214
ret e.mod_map.get(defid._1);
@@ -506,11 +506,11 @@ fn lookup_path_strict(&env e, &list[scope] sc, &span sp, vec[ident] idents,
506506
fn lookup_in_scope_strict(&env e, list[scope] sc, &span sp, &ident id,
507507
namespace ns) -> def {
508508
alt (lookup_in_scope(e, sc, sp, id, ns)) {
509-
case (none[def]) {
509+
case (none) {
510510
unresolved(e, sp, id, ns_name(ns));
511511
fail;
512512
}
513-
case (some[def](?d)) {
513+
case (some(?d)) {
514514
ret d;
515515
}
516516
}
@@ -617,10 +617,10 @@ fn lookup_in_scope(&env e, list[scope] sc, &span sp, &ident id, namespace ns)
617617
auto left_fn_level2 = false;
618618
while (true) {
619619
alt (sc) {
620-
case (nil[scope]) {
620+
case (nil) {
621621
ret none[def];
622622
}
623-
case (cons[scope](?hd, ?tl)) {
623+
case (cons(?hd, ?tl)) {
624624
auto fnd = in_scope(e, sp, id, hd, ns);
625625
if (!option::is_none(fnd)) {
626626
auto df = option::get(fnd);
@@ -788,11 +788,11 @@ fn found_def_item(&@ast::item i, namespace ns) -> option::t[def] {
788788
fn lookup_in_mod_strict(&env e, def m, &span sp, &ident id,
789789
namespace ns, dir dr) -> def {
790790
alt (lookup_in_mod(e, m, sp, id, ns, dr)) {
791-
case (none[def]) {
791+
case (none) {
792792
unresolved(e, sp, id, ns_name(ns));
793793
fail;
794794
}
795-
case (some[def](?d)) {
795+
case (some(?d)) {
796796
ret d;
797797
}
798798
}
@@ -872,12 +872,12 @@ fn lookup_in_local_mod(&env e, def_id defid, &span sp,
872872
ret none[def]; // name is not visible
873873
}
874874
alt(info.index.find(id)) {
875-
case (none[list[mod_index_entry]]) { }
876-
case (some[list[mod_index_entry]](?lst)) {
875+
case (none) { }
876+
case (some(?lst)) {
877877
while (true) {
878878
alt (lst) {
879-
case (nil[mod_index_entry]) { break; }
880-
case (cons[mod_index_entry](?hd, ?tl)) {
879+
case (nil) { break; }
880+
case (cons(?hd, ?tl)) {
881881
auto found = lookup_in_mie(e, hd, ns);
882882
if (!option::is_none(found)) { ret found; }
883883
lst = *tl;
@@ -987,10 +987,10 @@ fn lookup_in_mie(&env e, &mod_index_entry mie, namespace ns)
987987
fn add_to_index(&hashmap[ident,list[mod_index_entry]] index, &ident id,
988988
&mod_index_entry ent) {
989989
alt (index.find(id)) {
990-
case (none[list[mod_index_entry]]) {
990+
case (none) {
991991
index.insert(id, cons(ent, @nil[mod_index_entry]));
992992
}
993-
case (some[list[mod_index_entry]](?prev)) {
993+
case (some(?prev)) {
994994
index.insert(id, cons(ent, @prev));
995995
}
996996
}
@@ -1134,7 +1134,7 @@ fn check_mod_name(&env e, &ident name, &list[mod_index_entry] entries) {
11341134

11351135
while (true) {
11361136
alt (entries) {
1137-
case (cons[mod_index_entry](?entry, ?rest)) {
1137+
case (cons(?entry, ?rest)) {
11381138
if (!option::is_none(lookup_in_mie(e, entry, ns_value))) {
11391139
if (saw_value) { dup(e, mie_span(entry), "", name); }
11401140
else { saw_value = true; }
@@ -1149,7 +1149,7 @@ fn check_mod_name(&env e, &ident name, &list[mod_index_entry] entries) {
11491149
}
11501150
entries = *rest;
11511151
}
1152-
case (nil[mod_index_entry]) { break; }
1152+
case (nil) { break; }
11531153
}
11541154
}
11551155
}

0 commit comments

Comments
 (0)