Skip to content

Commit f5ce3bf

Browse files
committed
More misc ivec->vec renaming
1 parent 223f601 commit f5ce3bf

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/comp/middle/ty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@ fn type_param(cx: &ctxt, ty: &t) -> option::t<uint> {
13481348
ret none;
13491349
}
13501350

1351-
// Returns an ivec of all the type variables
1351+
// Returns a vec of all the type variables
13521352
// occurring in t. It may contain duplicates.
13531353
fn vars_in_type(cx:&ctxt, ty: &t) -> [int] {
13541354
fn collect_var(cx:&ctxt, vars: &@mutable [int], ty: t) {
@@ -1362,7 +1362,7 @@ fn vars_in_type(cx:&ctxt, ty: &t) -> [int] {
13621362
let rslt: @mutable [int] = @mutable (~[]);
13631363
walk_ty(cx, bind collect_var(cx, rslt, _), ty);
13641364
// Works because of a "convenient" bug that lets us
1365-
// return a mutable ivec as if it's immutable
1365+
// return a mutable vec as if it's immutable
13661366
ret *rslt;
13671367
}
13681368

src/comp/syntax/ext/simplext.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn path_to_ident(pth: &path) -> option::t<ident> {
3939
ret none;
4040
}
4141

42-
//an ivec of binders might be a little big.
42+
//a vec of binders might be a little big.
4343
type clause = {params: binders, body: @expr};
4444

4545
/* logically, an arb_depth should contain only one kind of matchable */

src/comp/syntax/untyped_ast.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import std::ivec;
1+
import std::vec;
22
import std::vec::map;
33
import std::option;
44
import std::option::some;
@@ -410,7 +410,7 @@ fn cv_crate(ctx: &ctx, ut: &@ast_node) -> @crate {
410410
fn cv_crate_cfg(ctx: &ctx, ut: &@ast_node) -> crate_cfg {
411411
ret alt *ut {
412412
branch(n_crate_cfg., _, meta_items) {
413-
ivec::map(bind cv_meta_item(ctx,_), meta_items)
413+
vec::map(bind cv_meta_item(ctx,_), meta_items)
414414
}
415415
branch(_, sp, _) { ctx.ff(sp,"Invalid crate_cfg") }
416416
};

src/test/compile-fail/bad-module.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern: unresolved import: ivec
2-
import ivec;
1+
// error-pattern: unresolved import: vec
2+
import vec;
33

44
fn main() { let foo = vec::len([]); }

src/test/pretty/ivec-type.pp renamed to src/test/pretty/vec-type.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// pp-exact:ivec-type.pp
1+
// pp-exact:vec-type.pp
22

33
fn f1(x: [int]) { }
44

src/test/pretty/ivec-type.rs renamed to src/test/pretty/vec-type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// pp-exact:ivec-type.pp
1+
// pp-exact:vec-type.pp
22

33
fn f1(x: [int]) { }
44

0 commit comments

Comments
 (0)