diff --git a/src/comp/lib/llvm.rs b/src/comp/lib/llvm.rs index 1ee0f44297d..1ef6ccca41b 100644 --- a/src/comp/lib/llvm.rs +++ b/src/comp/lib/llvm.rs @@ -972,7 +972,7 @@ fn type_to_str_inner(names: type_names, outer0: [TypeRef], ty: TypeRef) -> let s = "fn("; let out_ty: TypeRef = llvm::LLVMGetReturnType(ty); let n_args = llvm::LLVMCountParamTypes(ty) as uint; - let args: [TypeRef] = vec::init_elt::(0 as TypeRef, n_args); + let args: [TypeRef] = vec::init_elt::(n_args, 0 as TypeRef); unsafe { llvm::LLVMGetParamTypes(ty, vec::to_ptr(args)); } @@ -984,7 +984,7 @@ fn type_to_str_inner(names: type_names, outer0: [TypeRef], ty: TypeRef) -> 10 { let s: str = "{"; let n_elts = llvm::LLVMCountStructElementTypes(ty) as uint; - let elts: [TypeRef] = vec::init_elt::(0 as TypeRef, n_elts); + let elts: [TypeRef] = vec::init_elt::(n_elts, 0 as TypeRef); unsafe { llvm::LLVMGetStructElementTypes(ty, vec::to_ptr(elts)); } @@ -1027,8 +1027,8 @@ fn float_width(llt: TypeRef) -> uint { } fn fn_ty_param_tys(fn_ty: TypeRef) -> [TypeRef] unsafe { - let args = vec::init_elt(0 as TypeRef, - llvm::LLVMCountParamTypes(fn_ty) as uint); + let args = vec::init_elt(llvm::LLVMCountParamTypes(fn_ty) as uint, + 0 as TypeRef); llvm::LLVMGetParamTypes(fn_ty, vec::to_ptr(args)); ret args; } diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index fd81bb72d48..b628c82fe81 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -338,7 +338,7 @@ fn get_simple_extern_fn(cx: @block_ctxt, llmod: ModuleRef, name: str, n_args: int) -> ValueRef { let ccx = cx.fcx.lcx.ccx; - let inputs = vec::init_elt::(ccx.int_type, n_args as uint); + let inputs = vec::init_elt::(n_args as uint, ccx.int_type); let output = ccx.int_type; let t = T_fn(inputs, output); ret get_extern_fn(externs, llmod, name, @@ -2842,7 +2842,7 @@ fn lval_maybe_callee_to_lval(c: lval_maybe_callee, ty: ty::t) -> lval_result { alt c.generic { some(gi) { let n_args = vec::len(ty::ty_fn_args(bcx_tcx(c.bcx), ty)); - let args = vec::init_elt(none::<@ast::expr>, n_args); + let args = vec::init_elt(n_args, none::<@ast::expr>); let space = alloc_ty(c.bcx, ty); let bcx = trans_closure::trans_bind_1(space.bcx, ty, c, args, ty, save_in(space.val)); diff --git a/src/comp/middle/trans_alt.rs b/src/comp/middle/trans_alt.rs index efdcd613fed..c9f7aff7695 100644 --- a/src/comp/middle/trans_alt.rs +++ b/src/comp/middle/trans_alt.rs @@ -175,7 +175,7 @@ fn enter_opt(ccx: @crate_ctxt, m: match, opt: opt, col: uint, tag_size: uint, ast::pat_range(l1, l2) { ret if opt_eq(range(l1, l2), opt) { some([]) } else { none }; } - _ { ret some(vec::init_elt(dummy, size)); } + _ { ret some(vec::init_elt(size, dummy)); } } } ret enter_match(m, col, val, bind e(ccx, dummy, opt, tag_size, _)); @@ -198,7 +198,7 @@ fn enter_rec(m: match, col: uint, fields: [ast::ident], val: ValueRef) -> } ret some(pats); } - _ { ret some(vec::init_elt(dummy, vec::len(fields))); } + _ { ret some(vec::init_elt(vec::len(fields), dummy)); } } } ret enter_match(m, col, val, bind e(dummy, fields, _)); @@ -210,7 +210,7 @@ fn enter_tup(m: match, col: uint, val: ValueRef, n_elts: uint) -> match { option::t<[@ast::pat]> { alt p.node { ast::pat_tup(elts) { ret some(elts); } - _ { ret some(vec::init_elt(dummy, n_elts)); } + _ { ret some(vec::init_elt(n_elts, dummy)); } } } ret enter_match(m, col, val, bind e(dummy, n_elts, _)); @@ -344,7 +344,7 @@ fn pick_col(m: match) -> uint { _ { 0u } } } - let scores = vec::init_elt_mut(0u, vec::len(m[0].pats)); + let scores = vec::init_elt_mut(vec::len(m[0].pats), 0u); for br: match_branch in m { let i = 0u; for p: @ast::pat in br.pats { scores[i] += score(p); i += 1u; } diff --git a/src/comp/middle/trans_common.rs b/src/comp/middle/trans_common.rs index 3e83f3da2f3..baf368ab631 100644 --- a/src/comp/middle/trans_common.rs +++ b/src/comp/middle/trans_common.rs @@ -413,7 +413,7 @@ fn val_str(tn: type_names, v: ValueRef) -> str { ret ty_str(tn, val_ty(v)); } fn struct_elt(llstructty: TypeRef, n: uint) -> TypeRef unsafe { let elt_count = llvm::LLVMCountStructElementTypes(llstructty) as uint; assert (n < elt_count); - let elt_tys = vec::init_elt(T_nil(), elt_count); + let elt_tys = vec::init_elt(elt_count, T_nil()); llvm::LLVMGetStructElementTypes(llstructty, to_ptr(elt_tys)); ret llvm::LLVMGetElementType(elt_tys[n]); } @@ -594,8 +594,8 @@ fn T_tydesc_field(cx: @crate_ctxt, field: int) -> TypeRef unsafe { // Bit of a kludge: pick the fn typeref out of the tydesc.. let tydesc_elts: [TypeRef] = - vec::init_elt::(T_nil(), - abi::n_tydesc_fields as uint); + vec::init_elt::(abi::n_tydesc_fields as uint, + T_nil()); llvm::LLVMGetStructElementTypes(cx.tydesc_type, to_ptr::(tydesc_elts)); let t = llvm::LLVMGetElementType(tydesc_elts[field]); @@ -729,7 +729,7 @@ fn T_opaque_tag_ptr(cx: @crate_ctxt) -> TypeRef { } fn T_captured_tydescs(cx: @crate_ctxt, n: uint) -> TypeRef { - ret T_struct(vec::init_elt::(T_ptr(cx.tydesc_type), n)); + ret T_struct(vec::init_elt::(n, T_ptr(cx.tydesc_type))); } fn T_opaque_iface_ptr(cx: @crate_ctxt) -> TypeRef { diff --git a/src/comp/middle/trans_impl.rs b/src/comp/middle/trans_impl.rs index 9a0430481a4..2e2e245a1c1 100644 --- a/src/comp/middle/trans_impl.rs +++ b/src/comp/middle/trans_impl.rs @@ -139,7 +139,7 @@ fn trans_iface_callee(bcx: @block_ctxt, fld_expr: @ast::expr, fn llfn_arg_tys(ft: TypeRef) -> {inputs: [TypeRef], output: TypeRef} { let out_ty = llvm::LLVMGetReturnType(ft); let n_args = llvm::LLVMCountParamTypes(ft); - let args = vec::init_elt(0 as TypeRef, n_args as uint); + let args = vec::init_elt(n_args as uint, 0 as TypeRef); unsafe { llvm::LLVMGetParamTypes(ft, vec::to_ptr(args)); } {inputs: args, output: out_ty} } diff --git a/src/comp/middle/tstate/states.rs b/src/comp/middle/tstate/states.rs index ae621b8f31f..2a976d0469f 100644 --- a/src/comp/middle/tstate/states.rs +++ b/src/comp/middle/tstate/states.rs @@ -360,8 +360,8 @@ fn find_pre_post_state_expr(fcx: fn_ctxt, pres: prestate, e: @expr) -> bool { alt e.node { expr_vec(elts, _) { ret find_pre_post_state_exprs(fcx, pres, e.id, - vec::init_elt(init_assign, - vec::len(elts)), elts, + vec::init_elt(vec::len(elts), + init_assign), elts, return_val); } expr_call(operator, operands, _) { @@ -404,8 +404,8 @@ fn find_pre_post_state_expr(fcx: fn_ctxt, pres: prestate, e: @expr) -> bool { let exs = field_exprs(fields); let changed = find_pre_post_state_exprs(fcx, pres, e.id, - vec::init_elt(init_assign, - vec::len(fields)), + vec::init_elt(vec::len(fields), + init_assign), exs, return_val); let base_pres = alt vec::last(exs) { none { pres } @@ -418,8 +418,8 @@ fn find_pre_post_state_expr(fcx: fn_ctxt, pres: prestate, e: @expr) -> bool { } expr_tup(elts) { ret find_pre_post_state_exprs(fcx, pres, e.id, - vec::init_elt(init_assign, - vec::len(elts)), elts, + vec::init_elt(vec::len(elts), + init_assign), elts, return_val); } expr_copy(a) { ret find_pre_post_state_sub(fcx, pres, a, e.id, none); } diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index bc6cd6ee14b..992de7dab40 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -1650,7 +1650,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier, // HACK: build an arguments list with dummy arguments to // check against let dummy = {mode: ast::by_ref, ty: ty::mk_bot(fcx.ccx.tcx)}; - arg_tys = vec::init_elt(dummy, supplied_arg_count); + arg_tys = vec::init_elt(supplied_arg_count, dummy); } // Check the arguments. diff --git a/src/comp/syntax/print/pp.rs b/src/comp/syntax/print/pp.rs index 6a714158d3b..54227235957 100644 --- a/src/comp/syntax/print/pp.rs +++ b/src/comp/syntax/print/pp.rs @@ -102,9 +102,9 @@ fn mk_printer(out: io::writer, linewidth: uint) -> printer { // fall behind. let n: uint = 3u * linewidth; #debug("mk_printer %u", linewidth); - let token: [mutable token] = vec::init_elt_mut(EOF, n); - let size: [mutable int] = vec::init_elt_mut(0, n); - let scan_stack: [mutable uint] = vec::init_elt_mut(0u, n); + let token: [mutable token] = vec::init_elt_mut(n, EOF); + let size: [mutable int] = vec::init_elt_mut(n, 0); + let scan_stack: [mutable uint] = vec::init_elt_mut(n, 0u); let print_stack: [print_stack_elt] = []; @{out: out, buf_len: n, diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 2d0f16870f4..d3d02f08977 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -230,7 +230,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error], procres: procres) { // true if we found the error in question - let found_flags = vec::init_elt_mut(false, vec::len(expected_errors)); + let found_flags = vec::init_elt_mut(vec::len(expected_errors), false); if procres.status == 0 { fatal("process did not return an error status"); diff --git a/src/libcore/extfmt.rs b/src/libcore/extfmt.rs index cd9ccff88d0..a4a908b1c42 100644 --- a/src/libcore/extfmt.rs +++ b/src/libcore/extfmt.rs @@ -388,7 +388,7 @@ mod rt { // FIXME: This might be useful in str: but needs to be utf8 safe first fn str_init_elt(c: char, n_elts: uint) -> str { - let svec = vec::init_elt::(c as u8, n_elts); + let svec = vec::init_elt::(n_elts, c as u8); ret str::unsafe_from_bytes(svec); } diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs index 918b99d1b8a..f677af1efc7 100644 --- a/src/libcore/vec.rs +++ b/src/libcore/vec.rs @@ -121,7 +121,7 @@ Creates and initializes an immutable vector. Creates an immutable vector of size `n_elts` and initializes the elements to the value `t`. */ -fn init_elt(t: T, n_elts: uint) -> [T] { +fn init_elt(n_elts: uint, t: T) -> [T] { let v = []; reserve(v, n_elts); let i: uint = 0u; @@ -138,7 +138,7 @@ Creates and initializes a mutable vector. Creates a mutable vector of size `n_elts` and initializes the elements to the value `t`. */ -fn init_elt_mut(t: T, n_elts: uint) -> [mutable T] { +fn init_elt_mut(n_elts: uint, t: T) -> [mutable T] { let v = [mutable]; reserve(v, n_elts); let i: uint = 0u; @@ -1045,13 +1045,13 @@ mod tests { #[test] fn test_init_elt() { // Test on-stack init_elt. - let v = init_elt(10u, 2u); + let v = init_elt(2u, 10u); assert (len(v) == 2u); assert (v[0] == 10u); assert (v[1] == 10u); // Test on-heap init_elt. - v = init_elt(20u, 6u); + v = init_elt(6u, 20u); assert (v[0] == 20u); assert (v[1] == 20u); assert (v[2] == 20u); diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs index 8296398c9e6..59e6263f82f 100644 --- a/src/libstd/bitv.rs +++ b/src/libstd/bitv.rs @@ -49,7 +49,7 @@ init - If true then the bits are initialized to 1, otherwise 0 */ fn create(nbits: uint, init: bool) -> t { let elt = if init { !0u } else { 0u }; - let storage = vec::init_elt_mut::(elt, nbits / uint_bits + 1u); + let storage = vec::init_elt_mut::(nbits / uint_bits + 1u, elt); ret @{storage: storage, nbits: nbits}; } @@ -117,7 +117,7 @@ Function: clone Makes a copy of a bitvector */ fn clone(v: t) -> t { - let storage = vec::init_elt_mut::(0u, v.nbits / uint_bits + 1u); + let storage = vec::init_elt_mut::(v.nbits / uint_bits + 1u, 0u); let len = vec::len(v.storage); uint::range(0u, len) {|i| storage[i] = v.storage[i]; }; ret @{storage: storage, nbits: v.nbits}; diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs index 5ab9a44cd1a..290b981306f 100644 --- a/src/libstd/deque.rs +++ b/src/libstd/deque.rs @@ -127,7 +127,7 @@ fn create() -> t { mutable nelts: 0u, mutable lo: 0u, mutable hi: 0u, - mutable elts: vec::init_elt_mut(none, initial_capacity) + mutable elts: vec::init_elt_mut(initial_capacity, none) }; repr as t:: } diff --git a/src/libstd/extfmt.rs b/src/libstd/extfmt.rs index f5135ac8298..3e01d67bc55 100644 --- a/src/libstd/extfmt.rs +++ b/src/libstd/extfmt.rs @@ -380,7 +380,7 @@ mod rt { // FIXME: This might be useful in str: but needs to be utf8 safe first fn str_init_elt(c: char, n_elts: uint) -> str { - let svec = vec::init_elt::(c as u8, n_elts); + let svec = vec::init_elt::(n_elts, c as u8); ret str::unsafe_from_bytes(svec); } diff --git a/src/libstd/freebsd_os.rs b/src/libstd/freebsd_os.rs index 596db37bea9..847262ca10c 100644 --- a/src/libstd/freebsd_os.rs +++ b/src/libstd/freebsd_os.rs @@ -129,7 +129,7 @@ fn dylib_filename(base: str) -> str { ret "lib" + base + ".so"; } /// followed by a path separator fn get_exe_path() -> option::t unsafe { let bufsize = 1023u; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize, 0u8)); let mib = [libc_constants::CTL_KERN, libc_constants::KERN_PROC, libc_constants::KERN_PROC_PATHNAME, -1i32]; diff --git a/src/libstd/linux_os.rs b/src/libstd/linux_os.rs index 0dc31f11ab0..7bc0212c1c2 100644 --- a/src/libstd/linux_os.rs +++ b/src/libstd/linux_os.rs @@ -125,7 +125,7 @@ fn dylib_filename(base: str) -> str { ret "lib" + base + ".so"; } /// followed by a path separator fn get_exe_path() -> option::t { let bufsize = 1023u; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize, 0u8)); ret str::as_buf("/proc/self/exe", { |proc_self_buf| str::as_buf(path, { |path_buf| if libc::readlink(proc_self_buf, path_buf, bufsize) != -1 { diff --git a/src/libstd/macos_os.rs b/src/libstd/macos_os.rs index ad042b06c25..b72fc732379 100644 --- a/src/libstd/macos_os.rs +++ b/src/libstd/macos_os.rs @@ -134,7 +134,7 @@ fn dylib_filename(base: str) -> str { ret "lib" + base + ".dylib"; } fn get_exe_path() -> option::t { // FIXME: This doesn't handle the case where the buffer is too small let bufsize = 1023u32; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize as uint)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize as uint, 0u8)); ret str::as_buf(path, { |path_buf| if mac_libc::_NSGetExecutablePath(path_buf, ptr::mut_addr_of(bufsize)) == 0i32 { diff --git a/src/libstd/map.rs b/src/libstd/map.rs index bbf3f888cf6..c3517d4d3f6 100644 --- a/src/libstd/map.rs +++ b/src/libstd/map.rs @@ -242,7 +242,7 @@ mod chained { } fn chains(nchains: uint) -> [mutable chain] { - ret vec::init_elt_mut(absent, nchains); + ret vec::init_elt_mut(nchains, absent); } fn foreach_entry(chain0: chain, diff --git a/src/libstd/md4.rs b/src/libstd/md4.rs index b6ef12842a1..d31f0cb524b 100644 --- a/src/libstd/md4.rs +++ b/src/libstd/md4.rs @@ -25,7 +25,7 @@ fn md4(msg: [u8]) -> {a: u32, b: u32, c: u32, d: u32} { } let i = 0u, e = vec::len(msg); - let x = vec::init_elt_mut(0u32, 16u); + let x = vec::init_elt_mut(16u, 0u32); while i < e { let aa = a, bb = b, cc = c, dd = d; diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs index eb30897b1c0..9290bf8992e 100644 --- a/src/libstd/rope.rs +++ b/src/libstd/rope.rs @@ -181,7 +181,7 @@ fn concat(v: [rope]) -> rope { //Copy `v` into a mutable vector let len = vec::len(v); if len == 0u { ret node::empty; } - let ropes = vec::init_elt_mut(v[0], len); + let ropes = vec::init_elt_mut(len, v[0]); uint::range(1u, len) {|i| ropes[i] = v[i]; } @@ -779,7 +779,7 @@ mod node { //Firstly, split `str` in slices of hint_max_leaf_char_len let leaves = uint::div_ceil(char_len, hint_max_leaf_char_len); //Number of leaves - let nodes = vec::init_elt_mut(candidate, leaves); + let nodes = vec::init_elt_mut(leaves, candidate); let i = 0u; let offset = byte_start; @@ -892,7 +892,7 @@ mod node { } fn serialize_node(node: @node) -> str unsafe { - let buf = vec::init_elt_mut(0u8, byte_len(node)); + let buf = vec::init_elt_mut(byte_len(node), 0u8); let offset = 0u;//Current position in the buffer let it = leaf_iterator::start(node); while true { @@ -1223,7 +1223,7 @@ mod node { } fn start(node: @node) -> t { - let stack = vec::init_elt_mut(node, height(node)+1u); + let stack = vec::init_elt_mut(height(node)+1u, node); ret { stack: stack, mutable stackpos: 0 @@ -1490,7 +1490,7 @@ mod tests { } //Same rope, obtained with rope::concat - let r2 = concat(vec::init_elt(chunk, 10u)); + let r2 = concat(vec::init_elt(10u, chunk)); assert eq(r, r2); } diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs index 17bb82a722b..e23737a6c3f 100644 --- a/src/libstd/sha1.rs +++ b/src/libstd/sha1.rs @@ -274,13 +274,13 @@ fn mk_sha1() -> sha1 { } } let st = { - h: vec::init_elt_mut(0u32, digest_buf_len), + h: vec::init_elt_mut(digest_buf_len, 0u32), mutable len_low: 0u32, mutable len_high: 0u32, - msg_block: vec::init_elt_mut(0u8, msg_block_len), + msg_block: vec::init_elt_mut(msg_block_len, 0u8), mutable msg_block_idx: 0u, mutable computed: false, - work_buf: vec::init_elt_mut(0u32, work_buf_len) + work_buf: vec::init_elt_mut(work_buf_len, 0u32) }; let sh = st as sha1; sh.reset(); diff --git a/src/libstd/win32_os.rs b/src/libstd/win32_os.rs index ff45648cdba..949c818a7ed 100644 --- a/src/libstd/win32_os.rs +++ b/src/libstd/win32_os.rs @@ -114,7 +114,7 @@ fn getcwd() -> str { ret rustrt::rust_getcwd(); } fn get_exe_path() -> option::t { // FIXME: This doesn't handle the case where the buffer is too small let bufsize = 1023u; - let path = str::unsafe_from_bytes(vec::init_elt(0u8, bufsize)); + let path = str::unsafe_from_bytes(vec::init_elt(bufsize, 0u8)); ret str::as_buf(path, { |path_buf| if kernel32::GetModuleFileNameA(0u, path_buf, bufsize as u32) != 0u32 { diff --git a/src/rustdoc/gen.rs b/src/rustdoc/gen.rs index 20c6e224daa..a4b9528cfeb 100644 --- a/src/rustdoc/gen.rs +++ b/src/rustdoc/gen.rs @@ -39,7 +39,7 @@ enum hlvl { } fn write_header(ctxt: ctxt, lvl: hlvl, title: str) { - let hashes = str::from_chars(vec::init_elt('#', lvl as uint)); + let hashes = str::from_chars(vec::init_elt(lvl as uint, '#')); ctxt.w.write_line(#fmt("%s %s", hashes, title)); ctxt.w.write_line(""); } diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs index fce617b8d65..65c1971af6e 100644 --- a/src/test/bench/shootout-fannkuchredux.rs +++ b/src/test/bench/shootout-fannkuchredux.rs @@ -6,9 +6,9 @@ import vec; fn fannkuch(n: int) -> int { fn perm1init(i: uint) -> int { ret i as int; } - let perm = vec::init_elt_mut(0, n as uint); + let perm = vec::init_elt_mut(n as uint, 0); let perm1 = vec::init_fn_mut(n as uint, perm1init); - let count = vec::init_elt_mut(0, n as uint); + let count = vec::init_elt_mut(n as uint, 0); let f = 0; let i = 0; let k = 0; diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index e656bb650c5..7a068eb51b2 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -31,7 +31,7 @@ enum grid_t { grid_ctor(grid), } fn read_grid(f: io::reader) -> grid_t { assert f.read_line() == "9,9"; /* assert first line is exactly "9,9" */ - let g = vec::init_fn(10u, {|_i| vec::init_elt_mut(0 as u8, 10u) }); + let g = vec::init_fn(10u, {|_i| vec::init_elt_mut(10u, 0 as u8) }); while !f.eof() { // FIXME: replace with unicode compliant call let comps = str::split(str::trim(f.read_line()), ',' as u8); @@ -130,7 +130,7 @@ fn write_grid(f: io::writer, g: grid_t) { fn main(args: [str]) { let grid = if vec::len(args) == 1u { // FIXME create sudoku inline since nested vec consts dont work yet - let g = vec::init_fn(10u, {|_i| vec::init_elt_mut(0 as u8, 10u) }); + let g = vec::init_fn(10u, {|_i| vec::init_elt_mut(10u, 0 as u8) }); g[0][1] = 4u8; g[0][3] = 6u8; g[0][7] = 3u8; diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs index 7646028eb25..7f1aa92a47f 100644 --- a/src/test/run-pass/import-glob-crate.rs +++ b/src/test/run-pass/import-glob-crate.rs @@ -3,7 +3,7 @@ use std; import vec::*; fn main() { - let v = init_elt(0, 0u); + let v = init_elt(0u, 0); v += [4, 2]; assert (reversed(v) == [2, 4]); } diff --git a/src/test/run-pass/mod-view-items.rs b/src/test/run-pass/mod-view-items.rs index c83a6e53ebb..6e5e65bb736 100644 --- a/src/test/run-pass/mod-view-items.rs +++ b/src/test/run-pass/mod-view-items.rs @@ -7,7 +7,7 @@ mod m { use std; import vec; - fn f() -> [int] { vec::init_elt(0, 1u) } + fn f() -> [int] { vec::init_elt(1u, 0) } } fn main() { let x = m::f(); }