Skip to content

Commit a77f1ae

Browse files
brsonbrson
committed
---
yaml --- r: 4722 b: refs/heads/master c: f05a91a h: refs/heads/master v: v3
1 parent f6fc69c commit a77f1ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+741
-746
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: 38c2363c459b481f40392f78b4db843172961fd4
2+
refs/heads/master: f05a91a0dca0bcbb9d9e20584923803df827e35b

‎trunk/src/comp/back/link.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import metadata::encoder;
77
import middle::trans_common::crate_ctxt;
88
import std::str;
99
import std::fs;
10-
import std::ivec;
10+
import std::vec;
1111
import std::option;
1212
import option::some;
1313
import option::none;
@@ -358,8 +358,8 @@ fn build_link_meta(sess: &session::session, c: &ast::crate, output: &str,
358358
{
359359
let os =
360360
str::split(fs::basename(output), '.' as u8);
361-
assert (ivec::len(os) >= 2u);
362-
ivec::pop(os);
361+
assert (vec::len(os) >= 2u);
362+
vec::pop(os);
363363
str::connect(os, ".")
364364
};
365365
warn_missing(sess, "name", name);

‎trunk/src/comp/driver/rustc.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import std::option;
2727
import std::option::some;
2828
import std::option::none;
2929
import std::str;
30-
import std::ivec;
30+
import std::vec;
3131
import std::int;
3232
import std::io;
3333
import std::run;
@@ -441,8 +441,8 @@ fn opts() -> [getopts::opt] {
441441
}
442442

443443
fn main(args: vec[str]) {
444-
let args_ivec = ivec::from_vec(args);
445-
let binary = ivec::shift(args_ivec);
444+
let args_ivec = vec::from_vec(args);
445+
let binary = vec::shift(args_ivec);
446446
let binary_dir = fs::dirname(binary);
447447
let match =
448448
alt getopts::getopts(args_ivec, opts()) {
@@ -462,7 +462,7 @@ fn main(args: vec[str]) {
462462
}
463463
let sopts = build_session_options(binary, match, binary_dir);
464464
let sess = build_session(sopts);
465-
let n_inputs = ivec::len[str](match.free);
465+
let n_inputs = vec::len[str](match.free);
466466
let output_file = getopts::opt_maybe_str(match, "o");
467467
let glue = opt_present(match, "glue");
468468
if glue {
@@ -523,7 +523,7 @@ fn main(args: vec[str]) {
523523
} else {
524524
~["default", "rs"]
525525
};
526-
ivec::pop(parts);
526+
vec::pop(parts);
527527
saved_out_filename = str::connect(parts, ".");
528528
let suffix = alt sopts.output_type {
529529
link::output_type_none. { "none" }
@@ -580,7 +580,7 @@ fn main(args: vec[str]) {
580580
}(config, _);
581581
fn rmext(filename: str) -> str {
582582
let parts = str::split(filename, '.' as u8);
583-
ivec::pop(parts);
583+
vec::pop(parts);
584584
ret str::connect(parts, ".");
585585
}
586586
ret alt config.os {
@@ -639,8 +639,6 @@ fn main(args: vec[str]) {
639639
#[cfg(test)]
640640
mod test {
641641

642-
import std::ivec;
643-
644642
// When the user supplies --test we should implicitly supply --cfg test
645643
#[test]
646644
fn test_switch_implies_cfg_test() {
@@ -666,7 +664,7 @@ mod test {
666664
let sess = build_session(sessopts);
667665
let cfg = build_configuration(sess, "whatever", "whatever");
668666
let test_items = attr::find_meta_items_by_name(cfg, "test");
669-
assert (ivec::len(test_items) == 1u);
667+
assert (vec::len(test_items) == 1u);
670668
}
671669
}
672670

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Functions dealing with attributes and meta_items
22

3-
import std::ivec;
3+
import std::vec;
44
import std::str;
55
import std::map;
66
import std::option;
@@ -50,7 +50,7 @@ fn find_attrs_by_name(attrs: &[ast::attribute], name: ast::ident) ->
5050
option::some(a)
5151
} else { option::none }
5252
}(_, name);
53-
ret ivec::filter_map(filter, attrs);
53+
ret vec::filter_map(filter, attrs);
5454
}
5555

5656
fn get_attr_name(attr: &ast::attribute) -> ast::ident {
@@ -66,7 +66,7 @@ fn find_meta_items_by_name(metas: &[@ast::meta_item], name: ast::ident) ->
6666
option::some(m)
6767
} else { option::none }
6868
}(_, name);
69-
ret ivec::filter_map(filter, metas);
69+
ret vec::filter_map(filter, metas);
7070
}
7171

7272
fn get_meta_item_name(meta: &@ast::meta_item) -> ast::ident {
@@ -135,7 +135,7 @@ fn contains(haystack: &[@ast::meta_item], needle: @ast::meta_item) -> bool {
135135

136136
fn contains_name(metas: &[@ast::meta_item], name: ast::ident) -> bool {
137137
let matches = find_meta_items_by_name(metas, name);
138-
ret ivec::len(matches) > 0u;
138+
ret vec::len(matches) > 0u;
139139
}
140140

141141
// FIXME: This needs to sort by meta_item variant in addition to the item name
@@ -173,7 +173,7 @@ fn remove_meta_items_by_name(items: &[@ast::meta_item], name: str) ->
173173
} else { option::none }
174174
}(_, name);
175175

176-
ret ivec::filter_map(filter, items);
176+
ret vec::filter_map(filter, items);
177177
}
178178

179179
fn require_unique_names(sess: &session::session,

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import std::ivec;
1+
import std::vec;
22
import std::option;
33
import syntax::ast;
44
import syntax::fold;
@@ -32,9 +32,9 @@ fn filter_item(cfg: &ast::crate_cfg, item: &@ast::item) ->
3232
fn fold_mod(cfg: &ast::crate_cfg, m: &ast::_mod, fld: fold::ast_fold) ->
3333
ast::_mod {
3434
let filter = bind filter_item(cfg, _);
35-
let filtered_items = ivec::filter_map(filter, m.items);
36-
ret {view_items: ivec::map(fld.fold_view_item, m.view_items),
37-
items: ivec::map(fld.fold_item, filtered_items)};
35+
let filtered_items = vec::filter_map(filter, m.items);
36+
ret {view_items: vec::map(fld.fold_view_item, m.view_items),
37+
items: vec::map(fld.fold_item, filtered_items)};
3838
}
3939

4040
fn filter_native_item(cfg: &ast::crate_cfg, item: &@ast::native_item) ->
@@ -47,10 +47,10 @@ fn filter_native_item(cfg: &ast::crate_cfg, item: &@ast::native_item) ->
4747
fn fold_native_mod(cfg: &ast::crate_cfg, nm: &ast::native_mod,
4848
fld: fold::ast_fold) -> ast::native_mod {
4949
let filter = bind filter_native_item(cfg, _);
50-
let filtered_items = ivec::filter_map(filter, nm.items);
50+
let filtered_items = vec::filter_map(filter, nm.items);
5151
ret {native_name: nm.native_name,
5252
abi: nm.abi,
53-
view_items: ivec::map(fld.fold_view_item, nm.view_items),
53+
view_items: vec::map(fld.fold_view_item, nm.view_items),
5454
items: filtered_items};
5555
}
5656

@@ -74,8 +74,8 @@ fn filter_stmt(cfg: &ast::crate_cfg, stmt: &@ast::stmt) ->
7474
fn fold_block(cfg: &ast::crate_cfg, b: &ast::blk_, fld: fold::ast_fold) ->
7575
ast::blk_ {
7676
let filter = bind filter_stmt(cfg, _);
77-
let filtered_stmts = ivec::filter_map(filter, b.stmts);
78-
ret {stmts: ivec::map(fld.fold_stmt, filtered_stmts),
77+
let filtered_stmts = vec::filter_map(filter, b.stmts);
78+
ret {stmts: vec::map(fld.fold_stmt, filtered_stmts),
7979
expr: option::map(fld.fold_expr, b.expr),
8080
id: b.id};
8181
}
@@ -95,7 +95,7 @@ fn in_cfg(cfg: &ast::crate_cfg, attrs: &[ast::attribute]) -> bool {
9595

9696
// The "cfg" attributes on the item
9797
let item_cfg_attrs = attr::find_attrs_by_name(attrs, "cfg");
98-
let item_has_cfg_attrs = ivec::len(item_cfg_attrs) > 0u;
98+
let item_has_cfg_attrs = vec::len(item_cfg_attrs) > 0u;
9999
if !item_has_cfg_attrs { ret true; }
100100

101101
// Pull the inner meta_items from the #[cfg(meta_item, ...)] attributes,
@@ -115,7 +115,7 @@ fn in_cfg(cfg: &ast::crate_cfg, attrs: &[ast::attribute]) -> bool {
115115
}
116116
}
117117
let cfg_metas = attr::attr_metas(item_cfg_attrs);
118-
ivec::foldl(extract_metas, ~[], cfg_metas)
118+
vec::foldl(extract_metas, ~[], cfg_metas)
119119
};
120120

121121
for cfg_mi: @ast::meta_item in item_cfg_metas {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Code that generates a test runner to run all the tests in a crate
22

33
import std::option;
4-
import std::ivec;
4+
import std::vec;
55
import syntax::ast;
66
import syntax::fold;
77
import syntax::print::pprust;
@@ -69,7 +69,7 @@ fn fold_mod(cx: &test_ctxt, m: &ast::_mod, fld: fold::ast_fold) -> ast::_mod {
6969
}
7070

7171
let mod_nomain =
72-
{view_items: m.view_items, items: ivec::filter_map(nomain, m.items)};
72+
{view_items: m.view_items, items: vec::filter_map(nomain, m.items)};
7373
ret fold::noop_fold_mod(mod_nomain, fld);
7474
}
7575

@@ -93,24 +93,24 @@ fn fold_item(cx: &test_ctxt, i: &@ast::item, fld: fold::ast_fold) ->
9393
log "this is a test function";
9494
let test = {path: cx.path, ignore: is_ignored(i)};
9595
cx.testfns += ~[test];
96-
log #fmt("have %u test functions", ivec::len(cx.testfns));
96+
log #fmt("have %u test functions", vec::len(cx.testfns));
9797
}
9898

9999
let res = fold::noop_fold_item(i, fld);
100-
ivec::pop(cx.path);
100+
vec::pop(cx.path);
101101
ret res;
102102
}
103103

104104
fn is_test_fn(i: &@ast::item) -> bool {
105105
let has_test_attr =
106-
ivec::len(attr::find_attrs_by_name(i.attrs, "test")) > 0u;
106+
vec::len(attr::find_attrs_by_name(i.attrs, "test")) > 0u;
107107

108108
fn has_test_signature(i: &@ast::item) -> bool {
109109
alt i.node {
110110
ast::item_fn(f, tps) {
111-
let input_cnt = ivec::len(f.decl.inputs);
111+
let input_cnt = vec::len(f.decl.inputs);
112112
let no_output = f.decl.output.node == ast::ty_nil;
113-
let tparm_cnt = ivec::len(tps);
113+
let tparm_cnt = vec::len(tps);
114114
input_cnt == 0u && no_output && tparm_cnt == 0u
115115
}
116116
_ { false }
@@ -227,7 +227,7 @@ fn mk_test_desc_ivec_ty(cx: &test_ctxt) -> @ast::ty {
227227
}
228228

229229
fn mk_test_desc_vec(cx: &test_ctxt) -> @ast::expr {
230-
log #fmt("building test vector from %u tests", ivec::len(cx.testfns));
230+
log #fmt("building test vector from %u tests", vec::len(cx.testfns));
231231
let descs = ~[];
232232
for test: test in cx.testfns {
233233
let test_ = test; // Satisfy alias analysis

‎trunk/src/comp/lib/llvm.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import std::ivec;
1+
import std::vec;
22
import std::str;
33
import std::str::rustrt::sbuf;
44

@@ -928,8 +928,8 @@ obj builder(B: BuilderRef, terminated: @mutable bool,
928928
fn AggregateRet(RetVals: &[ValueRef]) -> ValueRef {
929929
assert (!*terminated);
930930
*terminated = true;
931-
ret llvm::LLVMBuildAggregateRet(B, ivec::to_ptr(RetVals),
932-
ivec::len(RetVals));
931+
ret llvm::LLVMBuildAggregateRet(B, vec::to_ptr(RetVals),
932+
vec::len(RetVals));
933933
}
934934

935935
fn Br(Dest: BasicBlockRef) -> ValueRef {
@@ -961,7 +961,7 @@ obj builder(B: BuilderRef, terminated: @mutable bool,
961961
Catch: BasicBlockRef) -> ValueRef {
962962
assert (!*terminated);
963963
*terminated = true;
964-
ret llvm::LLVMBuildInvoke(B, Fn, ivec::to_ptr(Args), ivec::len(Args),
964+
ret llvm::LLVMBuildInvoke(B, Fn, vec::to_ptr(Args), vec::len(Args),
965965
Then, Catch, str::buf(""));
966966
}
967967

@@ -1163,14 +1163,14 @@ obj builder(B: BuilderRef, terminated: @mutable bool,
11631163

11641164
fn GEP(Pointer: ValueRef, Indices: &[ValueRef]) -> ValueRef {
11651165
assert (!*terminated);
1166-
ret llvm::LLVMBuildGEP(B, Pointer, ivec::to_ptr(Indices),
1167-
ivec::len(Indices), str::buf(""));
1166+
ret llvm::LLVMBuildGEP(B, Pointer, vec::to_ptr(Indices),
1167+
vec::len(Indices), str::buf(""));
11681168
}
11691169

11701170
fn InBoundsGEP(Pointer: ValueRef, Indices: &[ValueRef]) -> ValueRef {
11711171
assert (!*terminated);
1172-
ret llvm::LLVMBuildInBoundsGEP(B, Pointer, ivec::to_ptr(Indices),
1173-
ivec::len(Indices), str::buf(""));
1172+
ret llvm::LLVMBuildInBoundsGEP(B, Pointer, vec::to_ptr(Indices),
1173+
vec::len(Indices), str::buf(""));
11741174
}
11751175

11761176
fn StructGEP(Pointer: ValueRef, Idx: uint) -> ValueRef {
@@ -1303,29 +1303,29 @@ obj builder(B: BuilderRef, terminated: @mutable bool,
13031303
ValueRef {
13041304
assert (!*terminated);
13051305
let phi = llvm::LLVMBuildPhi(B, Ty, str::buf(""));
1306-
assert (ivec::len[ValueRef](vals) == ivec::len[BasicBlockRef](bbs));
1307-
llvm::LLVMAddIncoming(phi, ivec::to_ptr(vals), ivec::to_ptr(bbs),
1308-
ivec::len(vals));
1306+
assert (vec::len[ValueRef](vals) == vec::len[BasicBlockRef](bbs));
1307+
llvm::LLVMAddIncoming(phi, vec::to_ptr(vals), vec::to_ptr(bbs),
1308+
vec::len(vals));
13091309
ret phi;
13101310
}
13111311

13121312
fn AddIncomingToPhi(phi: ValueRef, vals: &[ValueRef],
13131313
bbs: &[BasicBlockRef]) {
1314-
assert (ivec::len[ValueRef](vals) == ivec::len[BasicBlockRef](bbs));
1315-
llvm::LLVMAddIncoming(phi, ivec::to_ptr(vals), ivec::to_ptr(bbs),
1316-
ivec::len(vals));
1314+
assert (vec::len[ValueRef](vals) == vec::len[BasicBlockRef](bbs));
1315+
llvm::LLVMAddIncoming(phi, vec::to_ptr(vals), vec::to_ptr(bbs),
1316+
vec::len(vals));
13171317
}
13181318

13191319
fn Call(Fn: ValueRef, Args: &[ValueRef]) -> ValueRef {
13201320
assert (!*terminated);
1321-
ret llvm::LLVMBuildCall(B, Fn, ivec::to_ptr(Args), ivec::len(Args),
1321+
ret llvm::LLVMBuildCall(B, Fn, vec::to_ptr(Args), vec::len(Args),
13221322
str::buf(""));
13231323
}
13241324

13251325
fn FastCall(Fn: ValueRef, Args: &[ValueRef]) -> ValueRef {
13261326
assert (!*terminated);
13271327
let v =
1328-
llvm::LLVMBuildCall(B, Fn, ivec::to_ptr(Args), ivec::len(Args),
1328+
llvm::LLVMBuildCall(B, Fn, vec::to_ptr(Args), vec::len(Args),
13291329
str::buf(""));
13301330
llvm::LLVMSetInstructionCallConv(v, LLVMFastCallConv);
13311331
ret v;
@@ -1334,7 +1334,7 @@ obj builder(B: BuilderRef, terminated: @mutable bool,
13341334
fn CallWithConv(Fn: ValueRef, Args: &[ValueRef], Conv: uint) -> ValueRef {
13351335
assert (!*terminated);
13361336
let v =
1337-
llvm::LLVMBuildCall(B, Fn, ivec::to_ptr(Args), ivec::len(Args),
1337+
llvm::LLVMBuildCall(B, Fn, vec::to_ptr(Args), vec::len(Args),
13381338
str::buf(""));
13391339
llvm::LLVMSetInstructionCallConv(v, Conv);
13401340
ret v;
@@ -1403,7 +1403,7 @@ obj builder(B: BuilderRef, terminated: @mutable bool,
14031403
llvm::LLVMGetNamedFunction(M, str::buf("llvm.trap"));
14041404
assert (T as int != 0);
14051405
let Args: [ValueRef] = ~[];
1406-
ret llvm::LLVMBuildCall(B, T, ivec::to_ptr(Args), ivec::len(Args),
1406+
ret llvm::LLVMBuildCall(B, T, vec::to_ptr(Args), vec::len(Args),
14071407
str::buf(""));
14081408
}
14091409

@@ -1503,8 +1503,8 @@ fn type_to_str_inner(names: type_names, outer0: &[TypeRef], ty: TypeRef) ->
15031503
let s = "fn(";
15041504
let out_ty: TypeRef = llvm::LLVMGetReturnType(ty);
15051505
let n_args: uint = llvm::LLVMCountParamTypes(ty);
1506-
let args: [TypeRef] = ivec::init_elt[TypeRef](0 as TypeRef, n_args);
1507-
llvm::LLVMGetParamTypes(ty, ivec::to_ptr(args));
1506+
let args: [TypeRef] = vec::init_elt[TypeRef](0 as TypeRef, n_args);
1507+
llvm::LLVMGetParamTypes(ty, vec::to_ptr(args));
15081508
s += tys_str(names, outer, args);
15091509
s += ") -> ";
15101510
s += type_to_str_inner(names, outer, out_ty);
@@ -1515,8 +1515,8 @@ fn type_to_str_inner(names: type_names, outer0: &[TypeRef], ty: TypeRef) ->
15151515
9 {
15161516
let s: str = "{";
15171517
let n_elts: uint = llvm::LLVMCountStructElementTypes(ty);
1518-
let elts: [TypeRef] = ivec::init_elt[TypeRef](0 as TypeRef, n_elts);
1519-
llvm::LLVMGetStructElementTypes(ty, ivec::to_ptr(elts));
1518+
let elts: [TypeRef] = vec::init_elt[TypeRef](0 as TypeRef, n_elts);
1519+
llvm::LLVMGetStructElementTypes(ty, vec::to_ptr(elts));
15201520
s += tys_str(names, outer, elts);
15211521
s += "}";
15221522
ret s;
@@ -1534,7 +1534,7 @@ fn type_to_str_inner(names: type_names, outer0: &[TypeRef], ty: TypeRef) ->
15341534
for tout: TypeRef in outer0 {
15351535
i += 1u;
15361536
if tout as int == ty as int {
1537-
let n: uint = ivec::len[TypeRef](outer0) - i;
1537+
let n: uint = vec::len[TypeRef](outer0) - i;
15381538
ret "*\\" + std::int::str(n as int);
15391539
}
15401540
}
@@ -1563,8 +1563,8 @@ fn float_width(llt: TypeRef) -> uint {
15631563
}
15641564

15651565
fn fn_ty_param_tys(fn_ty: TypeRef) -> [TypeRef] {
1566-
let args = ivec::init_elt(0 as TypeRef, llvm::LLVMCountParamTypes(fn_ty));
1567-
llvm::LLVMGetParamTypes(fn_ty, ivec::to_ptr(args));
1566+
let args = vec::init_elt(0 as TypeRef, llvm::LLVMCountParamTypes(fn_ty));
1567+
llvm::LLVMGetParamTypes(fn_ty, vec::to_ptr(args));
15681568
ret args;
15691569
}
15701570

0 commit comments

Comments
 (0)