diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-02-29 23:44:52 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-03-02 15:49:49 -0800 |
| commit | 3ed6f6520f56204f1c7c799ec8fa231bef0fb4d1 (patch) | |
| tree | 4b8cb49db4cbf3fa3bb7a88ba72f821d4c00dba9 /src/comp | |
| parent | 47e7a05a28c9662159af2d2e0f2b7efc13fa09cb (diff) | |
| download | rust-3ed6f6520f56204f1c7c799ec8fa231bef0fb4d1.tar.gz rust-3ed6f6520f56204f1c7c799ec8fa231bef0fb4d1.zip | |
core: Remove _mut functions from vec
Instead, use vec::to_mut/from_mut to transform vectors in place as needed.
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/middle/check_alt.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/trans/alt.rs | 2 | ||||
| -rw-r--r-- | src/comp/middle/trans/base.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/tstate/auxiliary.rs | 2 | ||||
| -rw-r--r-- | src/comp/syntax/print/pp.rs | 6 |
5 files changed, 10 insertions, 8 deletions
diff --git a/src/comp/middle/check_alt.rs b/src/comp/middle/check_alt.rs index 894aa6af371..6d55aed095e 100644 --- a/src/comp/middle/check_alt.rs +++ b/src/comp/middle/check_alt.rs @@ -88,7 +88,7 @@ fn check_exhaustive(tcx: ty::ctxt, sp: span, pats: [@pat]) { })); } ty::ty_tup(ts) { - let cols = vec::init_elt_mut(ts.len(), []); + let cols = vec::to_mut(vec::init_elt(ts.len(), [])); for p in pats { alt raw_pat(p).node { pat_tup(sub) { @@ -156,7 +156,7 @@ fn check_exhaustive_enum(tcx: ty::ctxt, enum_id: def_id, sp: span, let variants = enum_variants(tcx, enum_id); let columns_by_variant = vec::map(*variants, {|v| {mutable seen: false, - cols: vec::init_elt_mut(v.args.len(), [])} + cols: vec::to_mut(vec::init_elt(v.args.len(), []))} }); for pat in pats { diff --git a/src/comp/middle/trans/alt.rs b/src/comp/middle/trans/alt.rs index 9e5333ade64..29200a47287 100644 --- a/src/comp/middle/trans/alt.rs +++ b/src/comp/middle/trans/alt.rs @@ -337,7 +337,7 @@ fn pick_col(m: match) -> uint { _ { 0u } } } - let scores = vec::init_elt_mut(m[0].pats.len(), 0u); + let scores = vec::to_mut(vec::init_elt(m[0].pats.len(), 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/base.rs b/src/comp/middle/trans/base.rs index 846417fcb44..6947a6875c4 100644 --- a/src/comp/middle/trans/base.rs +++ b/src/comp/middle/trans/base.rs @@ -741,7 +741,9 @@ fn make_generic_glue_inner(ccx: crate_ctxt, t: ty::t, p += 1u; } - fcx.lltyparams = vec::map_mut(lltydescs, {|d| {desc: d, dicts: none}}); + fcx.lltyparams = vec::map(vec::from_mut(lltydescs), {|d| + {desc: d, dicts: none} + }); let bcx = top_scope_block(fcx, none); let lltop = bcx.llbb; diff --git a/src/comp/middle/tstate/auxiliary.rs b/src/comp/middle/tstate/auxiliary.rs index 11b1ef3366e..df358a86004 100644 --- a/src/comp/middle/tstate/auxiliary.rs +++ b/src/comp/middle/tstate/auxiliary.rs @@ -294,7 +294,7 @@ fn get_fn_info(ccx: crate_ctxt, id: node_id) -> fn_info { fn add_node(ccx: crate_ctxt, i: node_id, a: ts_ann) { let sz = vec::len(*ccx.node_anns); if sz <= i as uint { - vec::grow_mut(*ccx.node_anns, (i as uint) - sz + 1u, empty_ann(0u)); + vec::grow(*ccx.node_anns, (i as uint) - sz + 1u, empty_ann(0u)); } ccx.node_anns[i] = a; } diff --git a/src/comp/syntax/print/pp.rs b/src/comp/syntax/print/pp.rs index 3ee31314299..0b55bb8c356 100644 --- a/src/comp/syntax/print/pp.rs +++ b/src/comp/syntax/print/pp.rs @@ -101,9 +101,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(n, EOF); - let size: [mutable int] = vec::init_elt_mut(n, 0); - let scan_stack: [mutable uint] = vec::init_elt_mut(n, 0u); + let token: [mutable token] = vec::to_mut(vec::init_elt(n, EOF)); + let size: [mutable int] = vec::to_mut(vec::init_elt(n, 0)); + let scan_stack: [mutable uint] = vec::to_mut(vec::init_elt(n, 0u)); let print_stack: [print_stack_elt] = []; @{out: out, buf_len: n, |
