Skip to content

Commit 326c19d

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 3711 b: refs/heads/master c: e1b107d h: refs/heads/master i: 3709: bb7cd28 3707: 63590ab 3703: 42affa0 3695: f96bf13 3679: 24cf6a7 3647: 7f9f5ce 3583: c282e5e v: v3
1 parent 1679012 commit 326c19d

File tree

13 files changed

+63
-71
lines changed

13 files changed

+63
-71
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 3958c72cd8c899bfc77a56ad859e31e13615c1c5
2+
refs/heads/master: e1b107d74ef5c27ec4c000f1fe4a9f55a7c67b97

‎trunk/src/comp/front/config.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ fn filter_item(&ast::crate_cfg cfg,
3636
fn fold_mod(&ast::crate_cfg cfg, &ast::_mod m,
3737
fold::ast_fold fld) -> ast::_mod {
3838
auto filter = bind filter_item(cfg, _);
39-
auto filtered_items = vec::filter_map(filter, m.items);
40-
ret rec(view_items=vec::map(fld.fold_view_item, m.view_items),
41-
items=vec::map(fld.fold_item, filtered_items));
39+
auto filtered_items = ivec::filter_map(filter, m.items);
40+
ret rec(view_items=ivec::map(fld.fold_view_item, m.view_items),
41+
items=ivec::map(fld.fold_item, filtered_items));
4242
}
4343

4444
fn filter_native_item(&ast::crate_cfg cfg, &@ast::native_item item)
@@ -53,10 +53,10 @@ fn filter_native_item(&ast::crate_cfg cfg, &@ast::native_item item)
5353
fn fold_native_mod(&ast::crate_cfg cfg, &ast::native_mod nm,
5454
fold::ast_fold fld) -> ast::native_mod {
5555
auto filter = bind filter_native_item(cfg, _);
56-
auto filtered_items = vec::filter_map(filter, nm.items);
56+
auto filtered_items = ivec::filter_map(filter, nm.items);
5757
ret rec(native_name=nm.native_name,
5858
abi=nm.abi,
59-
view_items=vec::map(fld.fold_view_item, nm.view_items),
59+
view_items=ivec::map(fld.fold_view_item, nm.view_items),
6060
items=filtered_items);
6161
}
6262

‎trunk/src/comp/front/test.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@ fn fold_crate(&test_ctxt cx, &ast::crate_ c,
5050

5151
fn add_test_module(&test_ctxt cx, &ast::_mod m) -> ast::_mod {
5252
auto testmod = mk_test_module(cx);
53-
ret rec(items = m.items + [testmod]
54-
with m);
53+
ret rec(items=m.items + ~[testmod] with m);
5554
}
5655

5756
fn mk_test_module(&test_ctxt cx) -> @ast::item {
5857
auto mainfn = mk_main(cx);
59-
let ast::_mod testmod = rec(view_items = [],
60-
items = [mainfn]);
58+
let ast::_mod testmod = rec(view_items=~[], items=~[mainfn]);
6159
auto item_ = ast::item_mod(testmod);
6260
let ast::item item = rec(ident = "__test",
6361
attrs = ~[],

‎trunk/src/comp/metadata/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ fn encode_tag_variant_info(&@crate_ctxt cx, &ebml::writer ebml_w,
216216
encode_kind(ebml_w, 'v' as u8);
217217
encode_tag_id(ebml_w, local_def(id));
218218
encode_type(cx, ebml_w, node_id_to_monotype(cx.tcx, variant.node.id));
219-
if (vec::len[variant_arg](variant.node.args) > 0u) {
219+
if (ivec::len[variant_arg](variant.node.args) > 0u) {
220220
encode_symbol(cx, ebml_w, variant.node.id);
221221
}
222222
encode_discriminant(cx, ebml_w, variant.node.id);

‎trunk/src/comp/middle/resolve.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -382,25 +382,23 @@ fn visit_expr_with_scope(&@ast::expr x, &scopes sc, &vt[scopes] v) {
382382
visit::visit_expr(x, new_sc, v);
383383
}
384384

385-
fn follow_import(&env e, &scopes sc,
386-
vec[ident] path, &span sp) -> option::t[def] {
387-
auto path_len = vec::len(path);
385+
fn follow_import(&env e, &scopes sc, &ident[] path, &span sp)
386+
-> option::t[def] {
387+
auto path_len = ivec::len(path);
388388
auto dcur = lookup_in_scope_strict(e, sc, sp, path.(0), ns_module);
389389
auto i = 1u;
390390
while (true && option::is_some(dcur)) {
391391
if (i == path_len) { break; }
392-
dcur =
393-
lookup_in_mod_strict(e, option::get(dcur),
394-
sp, path.(i), ns_module, outside);
392+
dcur = lookup_in_mod_strict(e, option::get(dcur),
393+
sp, path.(i), ns_module, outside);
395394
i += 1u;
396395
}
397396
if (i == path_len) {
398397
alt (option::get(dcur)) {
399398
case (ast::def_mod(?def_id)) { ret dcur; }
400399
case (ast::def_native_mod(?def_id)) { ret dcur; }
401400
case (_) {
402-
e.sess.span_err(sp,
403-
str::connect(path, "::") +
401+
e.sess.span_err(sp, str::connect_ivec(path, "::") +
404402
" does not name a module.");
405403
ret none;
406404
}
@@ -457,7 +455,7 @@ fn resolve_import(&env e, &@ast::view_item it, &scopes sc) {
457455
}
458456
}
459457
e.imports.insert(defid._1, resolving(it.span));
460-
auto n_idents = vec::len(ids);
458+
auto n_idents = ivec::len(ids);
461459
auto end_id = ids.(n_idents - 1u);
462460
if (n_idents == 1u) {
463461
auto next_sc = std::list::cdr(sc);

‎trunk/src/comp/middle/trans.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8529,7 +8529,7 @@ fn trans_res_ctor(@local_ctxt cx, &span sp, &ast::_fn dtor,
85298529
fn trans_tag_variant(@local_ctxt cx, ast::node_id tag_id,
85308530
&ast::variant variant, int index, bool is_degen,
85318531
&ast::ty_param[] ty_params) {
8532-
if (vec::len[ast::variant_arg](variant.node.args) == 0u) {
8532+
if (std::ivec::len[ast::variant_arg](variant.node.args) == 0u) {
85338533
ret; // nullary constructors are just constants
85348534

85358535
}
@@ -9043,7 +9043,7 @@ fn collect_tag_ctor(@crate_ctxt ccx, &@ast::item i, &vec[str] pt,
90439043
alt (i.node) {
90449044
case (ast::item_tag(?variants, ?tps)) {
90459045
for (ast::variant variant in variants) {
9046-
if (vec::len[ast::variant_arg](variant.node.args) != 0u) {
9046+
if (std::ivec::len(variant.node.args) != 0u) {
90479047
decl_fn_and_pair(ccx, i.span,
90489048
new_pt + [variant.node.name], "tag", tps,
90499049
variant.node.id);

‎trunk/src/comp/middle/ty.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,8 +2830,7 @@ fn tag_variants(&ctxt cx, &ast::def_id id) -> variant_info[] {
28302830
auto ctor_ty = node_id_to_monotype
28312831
(cx, variant.node.id);
28322832
let t[] arg_tys = ~[];
2833-
if (vec::len[ast::variant_arg](variant.node.args) >
2834-
0u) {
2833+
if (std::ivec::len(variant.node.args) > 0u) {
28352834
for (arg a in ty_fn_args(cx, ctor_ty)) {
28362835
arg_tys += ~[a.ty];
28372836
}

‎trunk/src/comp/middle/typeck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ mod collect {
692692
// constructors get turned into functions.
693693

694694
auto result_ty;
695-
if (vec::len[ast::variant_arg](variant.node.args) == 0u) {
695+
if (ivec::len[ast::variant_arg](variant.node.args) == 0u) {
696696
result_ty = ty::mk_tag(cx.tcx, tag_id, ty_param_tys);
697697
} else {
698698
// As above, tell ast_ty_to_ty() that trans_ty_item_to_ty()

‎trunk/src/comp/syntax/ast.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import std::ivec;
44
import std::option;
55
import std::str;
6-
import std::vec;
76
import codemap::span;
87
import codemap::filename;
98

@@ -481,7 +480,7 @@ type anon_obj =
481480
// with_obj: the original object being extended, if it exists.
482481
option::t[@expr] with_obj);
483482

484-
type _mod = rec(vec[@view_item] view_items, vec[@item] items);
483+
type _mod = rec((@view_item)[] view_items, (@item)[] items);
485484

486485
tag native_abi {
487486
native_abi_rust;
@@ -493,21 +492,21 @@ tag native_abi {
493492
type native_mod =
494493
rec(str native_name,
495494
native_abi abi,
496-
vec[@view_item] view_items,
497-
vec[@native_item] items);
495+
(@view_item)[] view_items,
496+
(@native_item)[] items);
498497

499498
type variant_arg = rec(@ty ty, node_id id);
500499

501-
type variant_ = rec(str name, vec[variant_arg] args, node_id id);
500+
type variant_ = rec(str name, (variant_arg)[] args, node_id id);
502501

503502
type variant = spanned[variant_];
504503

505504
type view_item = spanned[view_item_];
506505

507506
tag view_item_ {
508507
view_item_use(ident, (@meta_item)[], node_id);
509-
view_item_import(ident, vec[ident], node_id);
510-
view_item_import_glob(vec[ident], node_id);
508+
view_item_import(ident, ident[], node_id);
509+
view_item_import_glob(ident[], node_id);
511510
view_item_export(ident, node_id);
512511
}
513512

‎trunk/src/comp/syntax/fold.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,15 +463,15 @@ fn noop_fold_fn(&_fn f, ast_fold fld) -> _fn {
463463

464464
// ...nor do modules
465465
fn noop_fold_mod(&_mod m, ast_fold fld) -> _mod {
466-
ret rec(view_items=map(fld.fold_view_item, m.view_items),
467-
items=map(fld.fold_item, m.items));
466+
ret rec(view_items=ivec::map(fld.fold_view_item, m.view_items),
467+
items=ivec::map(fld.fold_item, m.items));
468468
}
469469

470470
fn noop_fold_native_mod(&native_mod nm, ast_fold fld) -> native_mod {
471471
ret rec(native_name=nm.native_name,
472472
abi=nm.abi,
473-
view_items=map(fld.fold_view_item, nm.view_items),
474-
items=map(fld.fold_native_item, nm.items))
473+
view_items=ivec::map(fld.fold_view_item, nm.view_items),
474+
items=ivec::map(fld.fold_native_item, nm.items))
475475
}
476476

477477
fn noop_fold_variant(&variant_ v, ast_fold fld) -> variant_ {
@@ -480,7 +480,7 @@ fn noop_fold_variant(&variant_ v, ast_fold fld) -> variant_ {
480480
}
481481
auto fold_variant_arg = bind fold_variant_arg_(_,fld);
482482
ret rec(name=v.name,
483-
args=map(fold_variant_arg, v.args),
483+
args=ivec::map(fold_variant_arg, v.args),
484484
id=v.id);
485485
}
486486

‎trunk/src/comp/syntax/parse/eval.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ type ctx =
2525
ast::crate_cfg cfg);
2626

2727
fn eval_crate_directives(ctx cx, &(@ast::crate_directive)[] cdirs,
28-
str prefix, &mutable vec[@ast::view_item] view_items,
29-
&mutable vec[@ast::item] items) {
28+
str prefix, &mutable (@ast::view_item)[] view_items,
29+
&mutable (@ast::item)[] items) {
3030
for (@ast::crate_directive sub_cdir in cdirs) {
3131
eval_crate_directive(cx, sub_cdir, prefix, view_items, items);
3232
}
3333
}
3434

3535
fn eval_crate_directives_to_mod(ctx cx, &(@ast::crate_directive)[] cdirs,
3636
str prefix) -> ast::_mod {
37-
let vec[@ast::view_item] view_items = [];
38-
let vec[@ast::item] items = [];
37+
let (@ast::view_item)[] view_items = ~[];
38+
let (@ast::item)[] items = ~[];
3939
eval_crate_directives(cx, cdirs, prefix, view_items, items);
4040
ret rec(view_items=view_items, items=items);
4141
}
4242

4343
fn eval_crate_directive(ctx cx, @ast::crate_directive cdir, str prefix,
44-
&mutable vec[@ast::view_item] view_items,
45-
&mutable vec[@ast::item] items) {
44+
&mutable (@ast::view_item)[] view_items,
45+
&mutable (@ast::item)[] items) {
4646
alt (cdir.node) {
4747
case (ast::cdir_src_mod(?id, ?file_opt, ?attrs)) {
4848
auto file_path = id + ".rs";
@@ -68,7 +68,7 @@ fn eval_crate_directive(ctx cx, @ast::crate_directive cdir, str prefix,
6868
mod_attrs);
6969
// Thread defids and chpos through the parsers
7070
cx.chpos = p0.get_chpos();
71-
vec::push[@ast::item](items, i);
71+
items += ~[i];
7272
}
7373
case (ast::cdir_dir_mod(?id, ?dir_opt, ?cdirs, ?attrs)) {
7474
auto path = id;
@@ -85,11 +85,9 @@ fn eval_crate_directive(ctx cx, @ast::crate_directive cdir, str prefix,
8585
node=ast::item_mod(m0),
8686
span=cdir.span);
8787
cx.sess.next_id += 1;
88-
vec::push[@ast::item](items, i);
89-
}
90-
case (ast::cdir_view_item(?vi)) {
91-
vec::push[@ast::view_item](view_items, vi);
88+
items += ~[i];
9289
}
90+
case (ast::cdir_view_item(?vi)) { view_items += ~[vi]; }
9391
case (ast::cdir_syntax(?pth)) { }
9492
case (ast::cdir_auth(?pth, ?eff)) { }
9593
}

‎trunk/src/comp/syntax/parse/parser.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,15 +1859,15 @@ fn parse_mod_items(&parser p, token::token term,
18591859
parse_view(p)
18601860
} else {
18611861
// Shouldn't be any view items since we've already parsed an item attr
1862-
[]
1862+
~[]
18631863
};
1864-
let vec[@ast::item] items = [];
1864+
let (@ast::item)[] items = ~[];
18651865
auto initial_attrs = first_item_attrs;
18661866
while (p.peek() != term) {
18671867
auto attrs = initial_attrs + parse_outer_attributes(p);
18681868
initial_attrs = ~[];
18691869
alt (parse_item(p, attrs)) {
1870-
case (got_item(?i)) { vec::push(items, i); }
1870+
case (got_item(?i)) { items += ~[i]; }
18711871
case (_) {
18721872
p.fatal("expected item but found " +
18731873
token::to_str(p.get_reader(), p.peek()));
@@ -1948,14 +1948,14 @@ fn parse_native_mod_items(&parser p, &str native_name, ast::native_abi abi,
19481948
parse_native_view(p)
19491949
} else {
19501950
// Shouldn't be any view items since we've already parsed an item attr
1951-
[]
1951+
~[]
19521952
};
1953-
let vec[@ast::native_item] items = [];
1953+
let (@ast::native_item)[] items = ~[];
19541954
auto initial_attrs = first_item_attrs;
19551955
while (p.peek() != token::RBRACE) {
19561956
auto attrs = initial_attrs + parse_outer_attributes(p);
19571957
initial_attrs = ~[];
1958-
items += [parse_native_item(p, attrs)];
1958+
items += ~[parse_native_item(p, attrs)];
19591959
}
19601960
ret rec(native_name=native_name,
19611961
abi=abi,
@@ -2028,7 +2028,7 @@ fn parse_item_tag(&parser p, &ast::attribute[] attrs) -> @ast::item {
20282028
expect(p, token::SEMI);
20292029
auto variant = spanned(ty.span.lo, ty.span.hi,
20302030
rec(name=id,
2031-
args=[rec(ty=ty, id=p.get_id())],
2031+
args=~[rec(ty=ty, id=p.get_id())],
20322032
id=p.get_id()));
20332033
ret mk_item(p, lo, ty.span.hi, id,
20342034
ast::item_tag(~[variant], ty_params), attrs);
@@ -2041,14 +2041,14 @@ fn parse_item_tag(&parser p, &ast::attribute[] attrs) -> @ast::item {
20412041
check_bad_word(p);
20422042
auto vlo = p.get_lo_pos();
20432043
p.bump();
2044-
let vec[ast::variant_arg] args = [];
2044+
let ast::variant_arg[] args = ~[];
20452045
alt (p.peek()) {
20462046
case (token::LPAREN) {
20472047
auto arg_tys =
20482048
parse_seq(token::LPAREN, token::RPAREN,
20492049
some(token::COMMA), parse_ty, p);
20502050
for (@ast::ty ty in arg_tys.node) {
2051-
args += [rec(ty=ty, id=p.get_id())];
2051+
args += ~[rec(ty=ty, id=p.get_id())];
20522052
}
20532053
}
20542054
case (_) {/* empty */ }
@@ -2243,7 +2243,7 @@ fn parse_rest_import_name(&parser p, ast::ident first,
22432243
option::t[ast::ident] def_ident) ->
22442244
@ast::view_item {
22452245
auto lo = p.get_lo_pos();
2246-
let vec[ast::ident] identifiers = [first];
2246+
let ast::ident[] identifiers = ~[first];
22472247
let bool glob = false;
22482248
while (true) {
22492249
alt (p.peek()) {
@@ -2255,7 +2255,7 @@ fn parse_rest_import_name(&parser p, ast::ident first,
22552255
case (_) { p.fatal("expecting '::' or ';'"); }
22562256
}
22572257
alt (p.peek()) {
2258-
case (token::IDENT(_, _)) { identifiers += [parse_ident(p)]; }
2258+
case (token::IDENT(_, _)) { identifiers += ~[parse_ident(p)]; }
22592259
case (
22602260
//the lexer can't tell the different kinds of stars apart ) :
22612261
token::BINOP(token::STAR)) {
@@ -2278,7 +2278,7 @@ fn parse_rest_import_name(&parser p, ast::ident first,
22782278
import_decl =
22792279
ast::view_item_import_glob(identifiers, p.get_id());
22802280
} else {
2281-
auto len = vec::len(identifiers);
2281+
auto len = ivec::len(identifiers);
22822282
import_decl =
22832283
ast::view_item_import(identifiers.(len - 1u), identifiers,
22842284
p.get_id());
@@ -2347,15 +2347,15 @@ fn is_view_item(&parser p) -> bool {
23472347
ret false;
23482348
}
23492349

2350-
fn parse_view(&parser p) -> vec[@ast::view_item] {
2351-
let vec[@ast::view_item] items = [];
2352-
while (is_view_item(p)) { items += [parse_view_item(p)]; }
2350+
fn parse_view(&parser p) -> (@ast::view_item)[] {
2351+
let (@ast::view_item)[] items = ~[];
2352+
while (is_view_item(p)) { items += ~[parse_view_item(p)]; }
23532353
ret items;
23542354
}
23552355

2356-
fn parse_native_view(&parser p) -> vec[@ast::view_item] {
2357-
let vec[@ast::view_item] items = [];
2358-
while (is_view_item(p)) { items += [parse_view_item(p)]; }
2356+
fn parse_native_view(&parser p) -> (@ast::view_item)[] {
2357+
let (@ast::view_item)[] items = ~[];
2358+
while (is_view_item(p)) { items += ~[parse_view_item(p)]; }
23592359
ret items;
23602360
}
23612361

0 commit comments

Comments
 (0)