From 579eb2400b3cb5d9cf03a5c8792d63630489193a Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Wed, 5 Mar 2014 14:02:44 -0800 Subject: [PATCH] test: Automatically remove all `~[T]` from tests. --- .../anon-extern-mod-cross-crate-1.rs | 1 + src/test/auxiliary/cci_class_6.rs | 6 +- src/test/auxiliary/cci_nested_lib.rs | 6 +- src/test/auxiliary/cci_no_inline_lib.rs | 2 +- src/test/auxiliary/issue-2631-a.rs | 2 +- src/test/auxiliary/issue_2723_a.rs | 2 +- src/test/bench/core-std.rs | 19 +-- src/test/bench/core-uint-to-str.rs | 4 +- src/test/bench/msgsend-pipes-shared.rs | 6 +- src/test/bench/msgsend-pipes.rs | 6 +- src/test/bench/msgsend-ring-mutex-arcs.rs | 10 +- src/test/bench/msgsend-ring-rw-arcs.rs | 10 +- src/test/bench/shootout-ackermann.rs | 4 +- src/test/bench/shootout-chameneos-redux.rs | 16 +-- src/test/bench/shootout-fasta-redux.rs | 4 +- src/test/bench/shootout-fasta.rs | 3 +- src/test/bench/shootout-fibo.rs | 4 +- src/test/bench/shootout-k-nucleotide-pipes.rs | 32 ++--- src/test/bench/shootout-k-nucleotide.rs | 7 +- src/test/bench/shootout-meteor.rs | 38 ++--- src/test/bench/shootout-nbody.rs | 4 +- src/test/bench/shootout-pfib.rs | 10 +- src/test/bench/shootout-spectralnorm.rs | 16 ++- src/test/bench/shootout-threadring.rs | 2 +- src/test/bench/std-smallintmap.rs | 4 +- src/test/bench/sudoku.rs | 8 +- src/test/bench/task-perf-alloc-unwind.rs | 4 +- .../bench/task-perf-jargon-metal-smoke.rs | 4 +- src/test/bench/task-perf-one-million.rs | 10 +- src/test/bench/task-perf-spawnalot.rs | 4 +- .../compile-fail/access-mode-in-closures.rs | 4 +- src/test/compile-fail/ambig_impl_unify.rs | 6 +- .../compile-fail/auto-ref-slice-plus-ref.rs | 2 +- src/test/compile-fail/bad-expr-path.rs | 2 +- src/test/compile-fail/bad-expr-path2.rs | 2 +- src/test/compile-fail/bad-module.rs | 2 +- .../compile-fail/borrowck-assign-comp-idx.rs | 6 +- .../borrowck-borrowed-uniq-rvalue-2.rs | 2 +- .../compile-fail/borrowck-loan-vec-content.rs | 4 +- .../borrowck-move-out-of-vec-tail.rs | 4 +- .../borrowck-mut-slice-of-imm-vec.rs | 2 +- .../borrowck-vec-pattern-element-loan.rs | 6 +- .../borrowck-vec-pattern-loan-from-mut.rs | 2 +- .../borrowck-vec-pattern-nesting.rs | 8 +- .../borrowck-vec-pattern-tail-element-loan.rs | 2 +- src/test/compile-fail/drop-on-non-struct.rs | 2 +- .../compile-fail/empty-vec-trailing-comma.rs | 2 +- src/test/compile-fail/evec-subtyping.rs | 4 +- src/test/compile-fail/import.rs | 2 +- src/test/compile-fail/import2.rs | 2 +- src/test/compile-fail/import3.rs | 2 +- src/test/compile-fail/import4.rs | 2 +- .../infinite-vec-type-recursion.rs | 4 +- src/test/compile-fail/issue-10412.rs | 6 +- src/test/compile-fail/issue-10487.rs | 2 +- src/test/compile-fail/issue-1655.rs | 4 +- src/test/compile-fail/issue-2149.rs | 6 +- src/test/compile-fail/issue-2150.rs | 2 +- src/test/compile-fail/issue-2281-part1.rs | 2 +- src/test/compile-fail/issue-2548.rs | 4 +- src/test/compile-fail/issue-2590.rs | 6 +- src/test/compile-fail/issue-3044.rs | 2 +- src/test/compile-fail/issue-7573.rs | 2 +- src/test/compile-fail/issue-8727.rs | 6 +- src/test/compile-fail/kindck-freeze.rs | 2 +- src/test/compile-fail/kindck-pod.rs | 2 +- src/test/compile-fail/kindck-send.rs | 2 +- src/test/compile-fail/lint-heap-memory.rs | 2 +- .../compile-fail/lint-unused-mut-variables.rs | 8 +- src/test/compile-fail/lint-unused-unsafe.rs | 2 +- src/test/compile-fail/liveness-issue-2163.rs | 2 +- src/test/compile-fail/match-vec-invalid.rs | 2 +- .../compile-fail/match-vec-unreachable.rs | 6 +- .../moves-based-on-type-access-to-field.rs | 2 +- .../compile-fail/moves-based-on-type-exprs.rs | 10 +- src/test/compile-fail/nested-ty-params.rs | 2 +- src/test/compile-fail/no-capture-arc.rs | 2 +- src/test/compile-fail/no-reuse-move-arc.rs | 2 +- .../non-constant-enum-for-vec-repeat.rs | 2 +- src/test/compile-fail/non-copyable-void.rs | 2 +- src/test/compile-fail/non-exhaustive-match.rs | 8 +- src/test/compile-fail/pattern-tyvar-2.rs | 2 +- src/test/compile-fail/pattern-tyvar.rs | 2 +- src/test/compile-fail/qquote-1.rs | 2 +- src/test/compile-fail/qquote-2.rs | 2 +- .../regions-escape-loop-via-vec.rs | 2 +- src/test/compile-fail/repeat_count.rs | 2 +- src/test/compile-fail/seq-args.rs | 2 +- .../tag-that-dare-not-speak-its-name.rs | 2 +- .../uninstantiable-fixed-length-vec.rs | 4 +- src/test/compile-fail/unique-vec-res.rs | 6 +- ...use-after-move-implicity-coerced-object.rs | 5 +- src/test/compile-fail/vec-field.rs | 19 --- src/test/compile-fail/vec-mut-iter-borrow.rs | 2 +- src/test/compile-fail/vec-res-add.rs | 4 +- src/test/compile-fail/vector-no-ann.rs | 2 +- .../compile-fail/writing-to-immutable-vec.rs | 2 +- src/test/debug-info/boxed-vec.rs | 2 +- src/test/debug-info/issue11600.rs | 2 +- .../managed-pointer-within-unique-vec.rs | 2 +- src/test/pretty/block-disambig.rs | 4 +- src/test/pretty/match-naked-expr-medium.rs | 4 +- src/test/pretty/vec-comments.rs | 16 +-- src/test/pretty/vec-type.rs | 4 +- .../bug-2470-bounds-check-overflow-2.rs | 2 +- .../bug-2470-bounds-check-overflow-3.rs | 8 +- .../bug-2470-bounds-check-overflow.rs | 2 +- src/test/run-fail/issue-3029.rs | 4 +- src/test/run-fail/unwind-box-vec.rs | 2 +- src/test/run-fail/unwind-interleaved.rs | 4 +- src/test/run-fail/unwind-misc-1.rs | 2 +- src/test/run-fail/unwind-partial-box.rs | 2 +- src/test/run-fail/unwind-partial-unique.rs | 2 +- src/test/run-fail/unwind-partial-vec.rs | 4 +- src/test/run-fail/unwind-rec.rs | 4 +- src/test/run-fail/unwind-rec2.rs | 8 +- src/test/run-fail/unwind-tup.rs | 2 +- src/test/run-fail/unwind-tup2.rs | 6 +- src/test/run-fail/vec-overrun.rs | 2 +- src/test/run-pass-fulldeps/qquote.rs | 2 +- src/test/run-pass-fulldeps/quote-tokens.rs | 4 +- .../run-pass/alloca-from-derived-tydesc.rs | 6 +- src/test/run-pass/assignability-trait.rs | 4 +- src/test/run-pass/auto-encode.rs | 2 +- src/test/run-pass/auto-loop.rs | 2 +- src/test/run-pass/auto-ref-slice-plus-ref.rs | 2 +- src/test/run-pass/auto-ref-sliceable.rs | 6 +- src/test/run-pass/autobind.rs | 8 +- src/test/run-pass/block-arg.rs | 2 +- src/test/run-pass/block-iter-1.rs | 4 +- src/test/run-pass/block-iter-2.rs | 4 +- .../run-pass/borrow-by-val-method-receiver.rs | 2 +- src/test/run-pass/borrowck-binding-mutbl.rs | 4 +- src/test/run-pass/borrowck-mut-uniq.rs | 6 +- .../run-pass/borrowck-mut-vec-as-imm-slice.rs | 4 +- .../run-pass/borrowck-root-while-cond-2.rs | 4 +- src/test/run-pass/break.rs | 2 +- .../call-closure-from-overloaded-op.rs | 2 +- src/test/run-pass/cci_no_inline_exe.rs | 2 +- .../class-poly-methods-cross-crate.rs | 8 +- src/test/run-pass/class-poly-methods.rs | 14 +- src/test/run-pass/cleanup-rvalue-scopes.rs | 2 +- ...nup-rvalue-temp-during-incomplete-alloc.rs | 4 +- .../run-pass/coerce-reborrow-imm-vec-rcvr.rs | 6 +- .../run-pass/coerce-reborrow-mut-vec-arg.rs | 4 +- .../run-pass/coerce-reborrow-mut-vec-rcvr.rs | 4 +- src/test/run-pass/const-enum-vec-repeat.rs | 2 +- src/test/run-pass/empty-mutable-vec.rs | 2 +- src/test/run-pass/expr-fn.rs | 2 +- src/test/run-pass/expr-match-fail.rs | 2 +- src/test/run-pass/expr-repeat-vstore.rs | 2 +- src/test/run-pass/for-destruct.rs | 2 +- src/test/run-pass/for-loop-fail.rs | 2 +- src/test/run-pass/foreach-nested.rs | 2 +- src/test/run-pass/generic-ivec-leak.rs | 2 +- src/test/run-pass/generic-ivec.rs | 2 +- src/test/run-pass/generic-static-methods.rs | 10 +- src/test/run-pass/getopts_ref.rs | 4 +- src/test/run-pass/glob-std.rs | 136 +++++++++--------- src/test/run-pass/hashmap-memory.rs | 8 +- src/test/run-pass/html-literals.rs | 4 +- src/test/run-pass/import-glob-crate.rs | 2 +- src/test/run-pass/infer-fn-tail-expr.rs | 2 +- src/test/run-pass/integral-indexing.rs | 2 +- src/test/run-pass/issue-1821.rs | 2 +- src/test/run-pass/issue-2502.rs | 6 +- src/test/run-pass/issue-2631-b.rs | 2 +- src/test/run-pass/issue-2723-b.rs | 2 +- src/test/run-pass/issue-2804.rs | 5 +- src/test/run-pass/issue-2904.rs | 6 +- src/test/run-pass/issue-2989.rs | 18 ++- src/test/run-pass/issue-3052.rs | 2 +- src/test/run-pass/issue-3389.rs | 14 +- src/test/run-pass/issue-3556.rs | 10 +- src/test/run-pass/issue-3563-3.rs | 2 +- src/test/run-pass/issue-3609.rs | 2 +- src/test/run-pass/issue-3991.rs | 2 +- src/test/run-pass/issue-4036.rs | 2 +- src/test/run-pass/issue-5708.rs | 2 +- src/test/run-pass/issue-6153.rs | 4 +- src/test/run-pass/issue-8898.rs | 2 +- src/test/run-pass/issue-9382.rs | 4 +- src/test/run-pass/ivec-add.rs | 4 +- src/test/run-pass/ivec-pass-by-value.rs | 4 +- src/test/run-pass/ivec-tag.rs | 10 +- src/test/run-pass/lambda-infer-unresolved.rs | 6 +- src/test/run-pass/linear-for-loop.rs | 2 +- src/test/run-pass/liveness-move-in-loop.rs | 2 +- src/test/run-pass/log-poly.rs | 2 +- src/test/run-pass/log-str.rs | 4 +- src/test/run-pass/loop-scope.rs | 2 +- src/test/run-pass/match-join.rs | 2 +- src/test/run-pass/match-vec-rvalue.rs | 2 +- src/test/run-pass/mod-view-items.rs | 3 +- src/test/run-pass/monad.rs | 16 +-- src/test/run-pass/morestack6.rs | 5 +- src/test/run-pass/move-arg-2-unique.rs | 6 +- src/test/run-pass/move-arg-2.rs | 6 +- src/test/run-pass/mutable-alias-vec.rs | 4 +- src/test/run-pass/mutable-vec-drop.rs | 4 +- src/test/run-pass/newtype-polymorphic.rs | 6 +- .../nullable-pointer-iotareduction.rs | 2 +- src/test/run-pass/nullable-pointer-size.rs | 2 +- ...cts-owned-object-borrowed-method-header.rs | 4 +- ...owned-object-borrowed-method-headerless.rs | 4 +- src/test/run-pass/overload-index-operator.rs | 5 +- src/test/run-pass/overloaded-deref.rs | 2 +- .../run-pass/packed-struct-generic-size.rs | 4 +- src/test/run-pass/pure-sum.rs | 8 +- src/test/run-pass/rcvr-borrowed-to-slice.rs | 6 +- src/test/run-pass/reflect-visit-type.rs | 8 +- src/test/run-pass/regions-borrow-evec-uniq.rs | 4 +- .../run-pass/regions-dependent-addr-of.rs | 4 +- .../run-pass/regions-dependent-autoslice.rs | 2 +- .../regions-infer-borrow-scope-view.rs | 2 +- src/test/run-pass/regions-mock-tcx.rs | 4 +- src/test/run-pass/seq-compare.rs | 18 +-- src/test/run-pass/shadow.rs | 6 +- .../run-pass/shape_intrinsic_tag_then_rec.rs | 6 +- src/test/run-pass/size-and-align.rs | 4 +- src/test/run-pass/static-impl.rs | 14 +- src/test/run-pass/swap-2.rs | 2 +- src/test/run-pass/task-comm-16.rs | 2 +- src/test/run-pass/task-comm-3.rs | 2 +- src/test/run-pass/trait-bounds-in-arc.rs | 14 +- src/test/run-pass/trait-generic.rs | 20 +-- src/test/run-pass/trait-to-str.rs | 8 +- src/test/run-pass/tydesc-name.rs | 2 +- src/test/run-pass/type-params-in-for-each.rs | 4 +- src/test/run-pass/unique-assign-generic.rs | 4 +- src/test/run-pass/unique-autoderef-index.rs | 2 +- src/test/run-pass/unique-create.rs | 2 +- src/test/run-pass/unique-drop-complex.rs | 2 +- src/test/run-pass/unique-in-vec-copy.rs | 2 +- src/test/run-pass/unique-in-vec.rs | 2 +- src/test/run-pass/vec-drop.rs | 4 +- src/test/run-pass/vec-growth.rs | 2 +- src/test/run-pass/vec-ivec-deadlock.rs | 4 +- src/test/run-pass/vec-late-init.rs | 4 +- src/test/run-pass/vec-push.rs | 2 +- src/test/run-pass/vec-self-append.rs | 6 +- src/test/run-pass/vec-slice.rs | 2 +- src/test/run-pass/vec-to_str.rs | 4 +- src/test/run-pass/vec-trailing-comma.rs | 8 +- src/test/run-pass/vec.rs | 2 +- src/test/run-pass/vector-no-ann-2.rs | 2 +- src/test/run-pass/while-with-break.rs | 4 +- 247 files changed, 628 insertions(+), 642 deletions(-) delete mode 100644 src/test/compile-fail/vec-field.rs diff --git a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs index aa6ee35a077..823c856da13 100644 --- a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs +++ b/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs @@ -12,6 +12,7 @@ use std::libc; +use std::vec_ng::Vec; #[link(name="rustrt")] extern { pub fn rust_get_test_int() -> libc::intptr_t; diff --git a/src/test/auxiliary/cci_class_6.rs b/src/test/auxiliary/cci_class_6.rs index 90344a544bf..a6d6372f88f 100644 --- a/src/test/auxiliary/cci_class_6.rs +++ b/src/test/auxiliary/cci_class_6.rs @@ -10,21 +10,21 @@ pub mod kitties { pub struct cat { - priv info : ~[U], + priv info : Vec , priv meows : uint, how_hungry : int, } impl cat { - pub fn speak(&mut self, stuff: ~[T]) { + pub fn speak(&mut self, stuff: Vec ) { self.meows += stuff.len(); } pub fn meow_count(&mut self) -> uint { self.meows } } - pub fn cat(in_x : uint, in_y : int, in_info: ~[U]) -> cat { + pub fn cat(in_x : uint, in_y : int, in_info: Vec ) -> cat { cat { meows: in_x, how_hungry: in_y, diff --git a/src/test/auxiliary/cci_nested_lib.rs b/src/test/auxiliary/cci_nested_lib.rs index 90b01f8888b..a9be1e62195 100644 --- a/src/test/auxiliary/cci_nested_lib.rs +++ b/src/test/auxiliary/cci_nested_lib.rs @@ -19,7 +19,7 @@ pub struct Entry { pub struct alist { eq_fn: extern "Rust" fn(A,A) -> bool, - data: @RefCell<~[Entry]>, + data: @RefCell> >, } pub fn alist_add(lst: &alist, k: A, v: B) { @@ -47,7 +47,7 @@ pub fn new_int_alist() -> alist { fn eq_int(a: int, b: int) -> bool { a == b } return alist { eq_fn: eq_int, - data: @RefCell::new(~[]), + data: @RefCell::new(Vec::new()), }; } @@ -57,6 +57,6 @@ pub fn new_int_alist_2() -> alist { fn eq_int(a: int, b: int) -> bool { a == b } return alist { eq_fn: eq_int, - data: @RefCell::new(~[]), + data: @RefCell::new(Vec::new()), }; } diff --git a/src/test/auxiliary/cci_no_inline_lib.rs b/src/test/auxiliary/cci_no_inline_lib.rs index 87689474ca3..ac8d3181227 100644 --- a/src/test/auxiliary/cci_no_inline_lib.rs +++ b/src/test/auxiliary/cci_no_inline_lib.rs @@ -11,7 +11,7 @@ #[crate_id="cci_no_inline_lib"]; // same as cci_iter_lib, more-or-less, but not marked inline -pub fn iter(v: ~[uint], f: |uint|) { +pub fn iter(v: Vec , f: |uint|) { let mut i = 0u; let n = v.len(); while i < n { diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue-2631-a.rs index 448d545ee22..e4b8b9e166d 100644 --- a/src/test/auxiliary/issue-2631-a.rs +++ b/src/test/auxiliary/issue-2631-a.rs @@ -17,7 +17,7 @@ use std::cell::RefCell; use collections::HashMap; -pub type header_map = HashMap<~str, @RefCell<~[@~str]>>; +pub type header_map = HashMap<~str, @RefCell>; // the unused ty param is necessary so this gets monomorphized pub fn request(req: &header_map) { diff --git a/src/test/auxiliary/issue_2723_a.rs b/src/test/auxiliary/issue_2723_a.rs index b3fa8e73cc2..3323e56e8f4 100644 --- a/src/test/auxiliary/issue_2723_a.rs +++ b/src/test/auxiliary/issue_2723_a.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub unsafe fn f(xs: ~[int]) { +pub unsafe fn f(xs: Vec ) { xs.map(|_x| { unsafe fn q() { fail!(); } }); } diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 6bf145e7976..edac363eb1a 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -21,6 +21,7 @@ use std::os; use std::str; use std::slice; +use std::vec; use std::io::File; macro_rules! bench ( @@ -61,8 +62,8 @@ fn maybe_run_test(argv: &[~str], name: ~str, test: ||) { } fn shift_push() { - let mut v1 = slice::from_elem(30000, 1); - let mut v2 = ~[]; + let mut v1 = Vec::from_elem(30000, 1); + let mut v2 = Vec::new(); while v1.len() > 0 { v2.push(v1.shift().unwrap()); @@ -85,7 +86,7 @@ fn read_line() { fn vec_plus() { let mut r = rand::task_rng(); - let mut v = ~[]; + let mut v = Vec::new(); let mut i = 0; while i < 1500 { let rv = slice::from_elem(r.gen_range(0u, i + 1), i); @@ -101,15 +102,15 @@ fn vec_plus() { fn vec_append() { let mut r = rand::task_rng(); - let mut v = ~[]; + let mut v = Vec::new(); let mut i = 0; while i < 1500 { let rv = slice::from_elem(r.gen_range(0u, i + 1), i); if r.gen() { - v = slice::append(v, rv); + v = vec::append(v, rv); } else { - v = slice::append(rv, v); + v = vec::append(rv, v); } i += 1; } @@ -118,7 +119,7 @@ fn vec_append() { fn vec_push_all() { let mut r = rand::task_rng(); - let mut v = ~[]; + let mut v = Vec::new(); for i in range(0u, 1500) { let mut rv = slice::from_elem(r.gen_range(0u, i + 1), i); if r.gen() { @@ -132,7 +133,7 @@ fn vec_push_all() { } fn is_utf8_ascii() { - let mut v : ~[u8] = ~[]; + let mut v : Vec = Vec::new(); for _ in range(0u, 20000) { v.push('b' as u8); if !str::is_utf8(v) { @@ -143,7 +144,7 @@ fn is_utf8_ascii() { fn is_utf8_multibyte() { let s = "b¢€𤭢"; - let mut v : ~[u8]= ~[]; + let mut v : Vec = Vec::new(); for _ in range(0u, 5000) { v.push_all(s.as_bytes()); if !str::is_utf8(v) { diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/core-uint-to-str.rs index db86be1dfd4..07571b17905 100644 --- a/src/test/bench/core-uint-to-str.rs +++ b/src/test/bench/core-uint-to-str.rs @@ -14,9 +14,9 @@ fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"10000000"] + vec!(~"", ~"10000000") } else if args.len() <= 1u { - ~[~"", ~"100000"] + vec!(~"", ~"100000") } else { args }; diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index be081afc39e..ea07320dd94 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -59,7 +59,7 @@ fn run(args: &[~str]) { let workers = from_str::(args[2]).unwrap(); let num_bytes = 100; let start = time::precise_time_s(); - let mut worker_results = ~[]; + let mut worker_results = Vec::new(); for _ in range(0u, workers) { let to_child = to_child.clone(); let mut builder = task::task(); @@ -96,9 +96,9 @@ fn run(args: &[~str]) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"1000000", ~"10000"] + vec!(~"", ~"1000000", ~"10000") } else if args.len() <= 1u { - ~[~"", ~"10000", ~"4"] + vec!(~"", ~"10000", ~"4") } else { args.clone() }; diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index 518b2d4c9ef..7e2c5ba46b2 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -53,7 +53,7 @@ fn run(args: &[~str]) { let workers = from_str::(args[2]).unwrap(); let num_bytes = 100; let start = time::precise_time_s(); - let mut worker_results = ~[]; + let mut worker_results = Vec::new(); let from_parent = if workers == 1 { let (to_child, from_parent) = channel(); let mut builder = task::task(); @@ -106,9 +106,9 @@ fn run(args: &[~str]) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"1000000", ~"8"] + vec!(~"", ~"1000000", ~"8") } else if args.len() <= 1u { - ~[~"", ~"10000", ~"4"] + vec!(~"", ~"10000", ~"4") } else { args.clone() }; diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs index 6bf25f2149c..7cd904d7d14 100644 --- a/src/test/bench/msgsend-ring-mutex-arcs.rs +++ b/src/test/bench/msgsend-ring-mutex-arcs.rs @@ -25,7 +25,7 @@ use std::uint; // A poor man's pipe. -type pipe = MutexArc<~[uint]>; +type pipe = MutexArc >; fn send(p: &pipe, msg: uint) { unsafe { @@ -47,7 +47,7 @@ fn recv(p: &pipe) -> uint { } fn init() -> (pipe,pipe) { - let m = MutexArc::new(~[]); + let m = MutexArc::new(Vec::new()); ((&m).clone(), m) } @@ -71,9 +71,9 @@ fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"100", ~"10000"] + vec!(~"", ~"100", ~"10000") } else if args.len() <= 1u { - ~[~"", ~"10", ~"100"] + vec!(~"", ~"10", ~"100") } else { args.clone() }; @@ -86,7 +86,7 @@ fn main() { let start = time::precise_time_s(); // create the ring - let mut futures = ~[]; + let mut futures = Vec::new(); for i in range(1u, num_tasks) { //println!("spawning %?", i); diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs index 90d7da65e1f..c615c510465 100644 --- a/src/test/bench/msgsend-ring-rw-arcs.rs +++ b/src/test/bench/msgsend-ring-rw-arcs.rs @@ -24,7 +24,7 @@ use std::uint; // A poor man's pipe. -type pipe = RWArc<~[uint]>; +type pipe = RWArc >; fn send(p: &pipe, msg: uint) { p.write_cond(|state, cond| { @@ -42,7 +42,7 @@ fn recv(p: &pipe) -> uint { } fn init() -> (pipe,pipe) { - let x = RWArc::new(~[]); + let x = RWArc::new(Vec::new()); ((&x).clone(), x) } @@ -66,9 +66,9 @@ fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"100", ~"10000"] + vec!(~"", ~"100", ~"10000") } else if args.len() <= 1u { - ~[~"", ~"10", ~"100"] + vec!(~"", ~"10", ~"100") } else { args.clone() }; @@ -81,7 +81,7 @@ fn main() { let start = time::precise_time_s(); // create the ring - let mut futures = ~[]; + let mut futures = Vec::new(); for i in range(1u, num_tasks) { //println!("spawning %?", i); diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs index 889d663fb5b..00075415f49 100644 --- a/src/test/bench/shootout-ackermann.rs +++ b/src/test/bench/shootout-ackermann.rs @@ -25,9 +25,9 @@ fn ack(m: int, n: int) -> int { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"12"] + vec!(~"", ~"12") } else if args.len() <= 1u { - ~[~"", ~"8"] + vec!(~"", ~"8") } else { args }; diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs index 51aff969996..c4671b4203f 100644 --- a/src/test/bench/shootout-chameneos-redux.rs +++ b/src/test/bench/shootout-chameneos-redux.rs @@ -39,7 +39,7 @@ fn show_color(cc: color) -> ~str { } } -fn show_color_list(set: ~[color]) -> ~str { +fn show_color_list(set: vec!(color)) -> ~str { let mut out = ~""; for col in set.iter() { out.push_char(' '); @@ -132,7 +132,7 @@ fn creature( } } -fn rendezvous(nn: uint, set: ~[color]) { +fn rendezvous(nn: uint, set: vec!(color)) { // these ports will allow us to hear from the creatures let (to_rendezvous, from_creatures) = channel::(); @@ -141,7 +141,7 @@ fn rendezvous(nn: uint, set: ~[color]) { // these channels will be passed to the creatures so they can talk to us // these channels will allow us to talk to each creature by 'name'/index - let to_creature: ~[Sender>] = + let to_creature: Vec>> = set.iter().enumerate().map(|(ii, col)| { // create each creature as a listener with a port, and // give us a channel to talk to each @@ -179,7 +179,7 @@ fn rendezvous(nn: uint, set: ~[color]) { } // save each creature's meeting stats - let mut report = ~[]; + let mut report = Vec::new(); for _to_one in to_creature.iter() { report.push(from_creatures_log.recv()); } @@ -199,9 +199,9 @@ fn rendezvous(nn: uint, set: ~[color]) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"200000"] + vec!(~"", ~"200000") } else if args.len() <= 1u { - ~[~"", ~"600"] + vec!(~"", ~"600") } else { args }; @@ -211,9 +211,9 @@ fn main() { print_complements(); println!(""); - rendezvous(nn, ~[Blue, Red, Yellow]); + rendezvous(nn, vec!(Blue, Red, Yellow)); println!(""); rendezvous(nn, - ~[Blue, Red, Yellow, Red, Yellow, Blue, Red, Yellow, Red, Blue]); + vec!(Blue, Red, Yellow, Red, Yellow, Blue, Red, Yellow, Red, Blue)); } diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout-fasta-redux.rs index fead298bc86..a21963ee0a9 100644 --- a/src/test/bench/shootout-fasta-redux.rs +++ b/src/test/bench/shootout-fasta-redux.rs @@ -59,8 +59,8 @@ ]; // FIXME: Use map(). -fn sum_and_scale(a: &'static [AminoAcid]) -> ~[AminoAcid] { - let mut result = ~[]; +fn sum_and_scale(a: &'static [AminoAcid]) -> Vec { + let mut result = Vec::new(); let mut p = 0f32; for a_i in a.iter() { let mut a_i = *a_i; diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs index ae0bd069c90..76ac8407d60 100644 --- a/src/test/bench/shootout-fasta.rs +++ b/src/test/bench/shootout-fasta.rs @@ -36,8 +36,7 @@ fn gen(&mut self) -> u32 { struct AAGen<'a> { rng: &'a mut MyRandom, - data: ~[(u32, u8)] -} + data: Vec<(u32, u8)> } impl<'a> AAGen<'a> { fn new<'b>(rng: &'b mut MyRandom, aa: &[(char, f32)]) -> AAGen<'b> { let mut cum = 0.; diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs index 785481819aa..eec54198c04 100644 --- a/src/test/bench/shootout-fibo.rs +++ b/src/test/bench/shootout-fibo.rs @@ -21,9 +21,9 @@ fn fib(n: int) -> int { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"40"] + vec!(~"", ~"40") } else if args.len() <= 1u { - ~[~"", ~"30"] + vec!(~"", ~"30") } else { args }; diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 0b5a19aaec8..1b1a41e610c 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -42,19 +42,19 @@ fn f64_cmp(x: f64, y: f64) -> Ordering { } // given a map, print a sorted version of it -fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str { +fn sort_and_fmt(mm: &HashMap , uint>, total: uint) -> ~str { fn pct(xx: uint, yy: uint) -> f64 { return (xx as f64) * 100.0 / (yy as f64); } // sort by key, then by value - fn sortKV(mut orig: ~[(~[u8],f64)]) -> ~[(~[u8],f64)] { + fn sortKV(mut orig: Vec<(Vec ,f64)> ) -> Vec<(Vec ,f64)> { orig.sort_by(|&(ref a, _), &(ref b, _)| a.cmp(b)); orig.sort_by(|&(_, a), &(_, b)| f64_cmp(b, a)); orig } - let mut pairs = ~[]; + let mut pairs = Vec::new(); // map -> [(k,%)] for (key, &val) in mm.iter() { @@ -76,7 +76,7 @@ fn sortKV(mut orig: ~[(~[u8],f64)]) -> ~[(~[u8],f64)] { } // given a map, search for the frequency of a pattern -fn find(mm: &HashMap<~[u8], uint>, key: ~str) -> uint { +fn find(mm: &HashMap , uint>, key: ~str) -> uint { let key = key.into_ascii().to_lower().into_str(); match mm.find_equiv(&key.as_bytes()) { option::None => { return 0u; } @@ -85,7 +85,7 @@ fn find(mm: &HashMap<~[u8], uint>, key: ~str) -> uint { } // given a map, increment the counter for a key -fn update_freq(mm: &mut HashMap<~[u8], uint>, key: &[u8]) { +fn update_freq(mm: &mut HashMap , uint>, key: &[u8]) { let key = key.to_owned(); let newval = match mm.pop(&key) { Some(v) => v + 1, @@ -97,7 +97,7 @@ fn update_freq(mm: &mut HashMap<~[u8], uint>, key: &[u8]) { // given a ~[u8], for each window call a function // i.e., for "hello" and windows of size four, // run it("hell") and it("ello"), then return "llo" -fn windows_with_carry(bb: &[u8], nn: uint, it: |window: &[u8]|) -> ~[u8] { +fn windows_with_carry(bb: &[u8], nn: uint, it: |window: &[u8]|) -> Vec { let mut ii = 0u; let len = bb.len(); @@ -110,18 +110,18 @@ fn windows_with_carry(bb: &[u8], nn: uint, it: |window: &[u8]|) -> ~[u8] { } fn make_sequence_processor(sz: uint, - from_parent: &Receiver<~[u8]>, + from_parent: &Receiver>, to_parent: &Sender<~str>) { - let mut freqs: HashMap<~[u8], uint> = HashMap::new(); - let mut carry: ~[u8] = ~[]; + let mut freqs: HashMap, uint> = HashMap::new(); + let mut carry = Vec::new(); let mut total: uint = 0u; - let mut line: ~[u8]; + let mut line: Vec ; loop { line = from_parent.recv(); - if line == ~[] { break; } + if line == Vec::new() { break; } carry = windows_with_carry(carry + line, sz, |window| { update_freq(&mut freqs, window); @@ -156,9 +156,9 @@ fn main() { let mut rdr = BufferedReader::new(rdr); // initialize each sequence sorter - let sizes = ~[1u,2,3,4,6,12,18]; - let mut streams = slice::from_fn(sizes.len(), |_| Some(channel::<~str>())); - let mut from_child = ~[]; + let sizes = vec!(1u,2,3,4,6,12,18); + let mut streams = Vec::from_fn(sizes.len(), |_| Some(channel::<~str>())); + let mut from_child = Vec::new(); let to_child = sizes.iter().zip(streams.mut_iter()).map(|(sz, stream_ref)| { let sz = *sz; let stream = replace(stream_ref, None); @@ -173,7 +173,7 @@ fn main() { }); to_child - }).collect::<~[Sender<~[u8]>]>(); + }).collect:: >> >(); // latch stores true after we've started @@ -215,7 +215,7 @@ fn main() { // finish... for (ii, _sz) in sizes.iter().enumerate() { - to_child[ii].send(~[]); + to_child[ii].send(Vec::new()); } // now fetch and print result messages diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index 1a981480ebe..d2cf4599df2 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -50,7 +50,7 @@ fn pack(string: &str) -> Code { // FIXME: Inefficient. fn unpack(&self, frame: i32) -> ~str { let mut key = self.hash(); - let mut result = ~[]; + let mut result = Vec::new(); for _ in range(0, frame) { result.push(unpack_symbol((key as u8) & 3)); key >>= 2; @@ -92,8 +92,7 @@ struct Entry { struct Table { count: i32, - items: ~[Option<~Entry>] -} + items: Vec> } struct Items<'a> { cur: Option<&'a Entry>, @@ -237,7 +236,7 @@ fn generate_frequencies(frequencies: &mut Table, } fn print_frequencies(frequencies: &Table, frame: i32) { - let mut vector = ~[]; + let mut vector = Vec::new(); for entry in frequencies.iter() { vector.push((entry.code, entry.count)); } diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index 97f2c887515..81b712cf9c6 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -63,7 +63,7 @@ fn next(&mut self) -> Option<&'a T> { // corresponding mirrored piece), with, as minimum coordinates, (0, // 0). If all is false, only generate half of the possibilities (used // to break the symetry of the board). -fn transform(piece: ~[(int, int)], all: bool) -> ~[~[(int, int)]] { +fn transform(piece: Vec<(int, int)> , all: bool) -> vec!(Vec<(int, int)> ) { let mut res = // rotations iterate(piece, |rot| rot.iter().map(|&(y, x)| (x + y, -y)).collect()) @@ -107,25 +107,25 @@ fn mask(dy: int, dx: int, id: uint, p: &[(int, int)]) -> Option { // Makes every possible masks. masks[id][i] correspond to every // possible masks for piece with identifier id with minimum coordinate // (i/5, i%5). -fn make_masks() -> ~[~[~[u64]]] { - let pieces = ~[ - ~[(0,0),(0,1),(0,2),(0,3),(1,3)], - ~[(0,0),(0,2),(0,3),(1,0),(1,1)], - ~[(0,0),(0,1),(0,2),(1,2),(2,1)], - ~[(0,0),(0,1),(0,2),(1,1),(2,1)], - ~[(0,0),(0,2),(1,0),(1,1),(2,1)], - ~[(0,0),(0,1),(0,2),(1,1),(1,2)], - ~[(0,0),(0,1),(1,1),(1,2),(2,1)], - ~[(0,0),(0,1),(0,2),(1,0),(1,2)], - ~[(0,0),(0,1),(0,2),(1,2),(1,3)], - ~[(0,0),(0,1),(0,2),(0,3),(1,2)]]; - let mut res = ~[]; +fn make_masks() -> Vec > > { + let pieces = vec!( + vec!((0,0),(0,1),(0,2),(0,3),(1,3)), + vec!((0,0),(0,2),(0,3),(1,0),(1,1)), + vec!((0,0),(0,1),(0,2),(1,2),(2,1)), + vec!((0,0),(0,1),(0,2),(1,1),(2,1)), + vec!((0,0),(0,2),(1,0),(1,1),(2,1)), + vec!((0,0),(0,1),(0,2),(1,1),(1,2)), + vec!((0,0),(0,1),(1,1),(1,2),(2,1)), + vec!((0,0),(0,1),(0,2),(1,0),(1,2)), + vec!((0,0),(0,1),(0,2),(1,2),(1,3)), + vec!((0,0),(0,1),(0,2),(0,3),(1,2))); + let mut res = Vec::new(); for (id, p) in pieces.move_iter().enumerate() { // To break the central symetry of the problem, every // transformation must be taken except for one piece (piece 3 // here). let trans = transform(p, id != 3); - let mut cur_piece = ~[]; + let mut cur_piece = Vec::new(); for dy in range(0, 10) { for dx in range(0, 5) { let masks = @@ -142,7 +142,7 @@ fn make_masks() -> ~[~[~[u64]]] { // Check if all coordinates can be covered by an unused piece and that // all unused piece can be placed on the board. -fn is_board_unfeasible(board: u64, masks: &[~[~[u64]]]) -> bool { +fn is_board_unfeasible(board: u64, masks: &[Vec > ]) -> bool { let mut coverable = board; for i in range(0, 50).filter(|&i| board & 1 << i == 0) { for (cur_id, pos_masks) in masks.iter().enumerate() { @@ -159,7 +159,7 @@ fn is_board_unfeasible(board: u64, masks: &[~[~[u64]]]) -> bool { } // Filter the masks that we can prove to result to unfeasible board. -fn filter_masks(masks: &[~[~[u64]]]) -> ~[~[~[u64]]] { +fn filter_masks(masks: &[Vec > ]) -> Vec > > { masks.iter().map( |p| p.iter().map( |p| p.iter() @@ -180,7 +180,7 @@ fn get_id(m: u64) -> u8 { // Converts a list of mask to a ~str. fn to_utf8(raw_sol: &List) -> ~str { - let mut sol: ~[u8] = std::slice::from_elem(50, '.' as u8); + let mut sol: Vec = Vec::from_elem(50, '.' as u8); for &m in raw_sol.iter() { let id = get_id(m); for i in range(0, 50) { @@ -237,7 +237,7 @@ fn handle_sol(raw_sol: &List, data: &mut Data) -> bool { // Search for every solutions. Returns false if the search was // stopped before the end. fn search( - masks: &[~[~[u64]]], + masks: &[Vec > ], board: u64, mut i: int, cur: List, diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index ce49b8b2141..72ae6c4d014 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -148,9 +148,9 @@ fn offset_momentum(bodies: &mut [Planet, ..N_BODIES]) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"1000"] + vec!(~"", ~"1000") } else if args.len() <= 1u { - ~[~"", ~"1000"] + vec!(~"", ~"1000") } else { args }; diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 78cd5f4c30a..6c3b75ef473 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -51,8 +51,8 @@ struct Config { stress: bool } -fn parse_opts(argv: ~[~str]) -> Config { - let opts = ~[getopts::optflag("", "stress", "")]; +fn parse_opts(argv: Vec<~str> ) -> Config { + let opts = vec!(getopts::optflag("", "stress", "")); let opt_args = argv.slice(1, argv.len()); @@ -75,7 +75,7 @@ fn stress_task(id: int) { } fn stress(num_tasks: int) { - let mut results = ~[]; + let mut results = Vec::new(); for i in range(0, num_tasks) { let mut builder = task::task(); results.push(builder.future_result()); @@ -91,9 +91,9 @@ fn stress(num_tasks: int) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"20"] + vec!(~"", ~"20") } else if args.len() <= 1u { - ~[~"", ~"8"] + vec!(~"", ~"8") } else { args }; diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs index ea8253f6e42..a387c6d146a 100644 --- a/src/test/bench/shootout-spectralnorm.rs +++ b/src/test/bench/shootout-spectralnorm.rs @@ -29,8 +29,10 @@ fn dot(v: &[f64], u: &[f64]) -> f64 { sum } -fn mult(v: RWArc<~[f64]>, out: RWArc<~[f64]>, f: fn(&~[f64], uint) -> f64) { - // We lanch in different tasks the work to be done. To finish +fn mult(v: RWArc>, + out: RWArc>, + f: fn(&Vec, uint) -> f64) { + // We launch in different tasks the work to be done. To finish // this fuction, we need to wait for the completion of every // tasks. To do that, we give to each tasks a wait_chan that we // drop at the end of the work. At the end of this function, we @@ -58,7 +60,7 @@ fn mult(v: RWArc<~[f64]>, out: RWArc<~[f64]>, f: fn(&~[f64], uint) -> f64) { for () in rx.iter() {} } -fn mult_Av_impl(v: &~[f64], i: uint) -> f64 { +fn mult_Av_impl(v: &Vec , i: uint) -> f64 { let mut sum = 0.; for (j, &v_j) in v.iter().enumerate() { sum += v_j / A(i, j); @@ -66,11 +68,11 @@ fn mult_Av_impl(v: &~[f64], i: uint) -> f64 { sum } -fn mult_Av(v: RWArc<~[f64]>, out: RWArc<~[f64]>) { +fn mult_Av(v: RWArc >, out: RWArc >) { mult(v, out, mult_Av_impl); } -fn mult_Atv_impl(v: &~[f64], i: uint) -> f64 { +fn mult_Atv_impl(v: &Vec , i: uint) -> f64 { let mut sum = 0.; for (j, &v_j) in v.iter().enumerate() { sum += v_j / A(j, i); @@ -78,11 +80,11 @@ fn mult_Atv_impl(v: &~[f64], i: uint) -> f64 { sum } -fn mult_Atv(v: RWArc<~[f64]>, out: RWArc<~[f64]>) { +fn mult_Atv(v: RWArc >, out: RWArc >) { mult(v, out, mult_Atv_impl); } -fn mult_AtAv(v: RWArc<~[f64]>, out: RWArc<~[f64]>, tmp: RWArc<~[f64]>) { +fn mult_AtAv(v: RWArc >, out: RWArc >, tmp: RWArc >) { mult_Av(v, tmp.clone()); mult_Atv(tmp, out); } diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs index 7f2cd368219..cfb950090a2 100644 --- a/src/test/bench/shootout-threadring.rs +++ b/src/test/bench/shootout-threadring.rs @@ -55,7 +55,7 @@ fn main() { use std::from_str::FromStr; let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"2000000", ~"503"] + vec!(~"", ~"2000000", ~"503") } else { os::args() diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs index 98deeec7e18..674b6a8b36a 100644 --- a/src/test/bench/std-smallintmap.rs +++ b/src/test/bench/std-smallintmap.rs @@ -32,9 +32,9 @@ fn check_sequential(min: uint, max: uint, map: &SmallIntMap) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"100000", ~"100"] + vec!(~"", ~"100000", ~"100") } else if args.len() <= 1u { - ~[~"", ~"10000", ~"50"] + vec!(~"", ~"10000", ~"50") } else { args }; diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index ba94290bd03..79eee4006ce 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -36,7 +36,7 @@ // // internal type of sudoku grids -type grid = ~[~[u8]]; +type grid = Vec > ; struct Sudoku { grid: grid @@ -68,9 +68,9 @@ pub fn equal(&self, other: &Sudoku) -> bool { pub fn read(mut reader: BufferedReader) -> Sudoku { assert!(reader.read_line().unwrap() == ~"9,9"); /* assert first line is exactly "9,9" */ - let mut g = slice::from_fn(10u, { |_i| ~[0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8] }); + let mut g = slice::from_fn(10u, { |_i| vec!(0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8) }); for line in reader.lines() { - let comps: ~[&str] = line.unwrap().trim().split(',').collect(); + let comps: Vec<&str> = line.trim().split(',').collect(); if comps.len() == 3u { let row = from_str::(comps[0]).unwrap() as u8; @@ -96,7 +96,7 @@ pub fn write(&self, writer: &mut io::Writer) { // solve sudoku grid pub fn solve(&mut self) { - let mut work: ~[(u8, u8)] = ~[]; /* queue of uncolored fields */ + let mut work: Vec<(u8, u8)> = Vec::new(); /* queue of uncolored fields */ for row in range(0u8, 9u8) { for col in range(0u8, 9u8) { let color = self.grid[row][col]; diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs index e0938a8ae03..1a33391a3d2 100644 --- a/src/test/bench/task-perf-alloc-unwind.rs +++ b/src/test/bench/task-perf-alloc-unwind.rs @@ -50,7 +50,7 @@ struct State { managed: @nillist, unique: ~nillist, tuple: (@nillist, ~nillist), - vec: ~[@nillist], + vec: vec!(@nillist), res: r } @@ -82,7 +82,7 @@ fn recurse_or_fail(depth: int, st: Option) { managed: @Nil, unique: ~Nil, tuple: (@Nil, ~Nil), - vec: ~[@Nil], + vec: vec!(@Nil), res: r(@Nil) } } diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/task-perf-jargon-metal-smoke.rs index 0bad9b507f9..9a57be54362 100644 --- a/src/test/bench/task-perf-jargon-metal-smoke.rs +++ b/src/test/bench/task-perf-jargon-metal-smoke.rs @@ -41,9 +41,9 @@ fn child_generation(gens_left: uint, tx: comm::Sender<()>) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"100000"] + vec!(~"", ~"100000") } else if args.len() <= 1 { - ~[~"", ~"100"] + vec!(~"", ~"100") } else { args.clone() }; diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/task-perf-one-million.rs index 75975b76ecb..39648f7a161 100644 --- a/src/test/bench/task-perf-one-million.rs +++ b/src/test/bench/task-perf-one-million.rs @@ -19,7 +19,7 @@ fn calc(children: uint, parent_wait_chan: &Sender>>) { - let wait_ports: ~[Receiver>>] = slice::from_fn(children, |_| { + let wait_ports: Vec>>> = vec::from_fn(children, |_| { let (wait_port, wait_chan) = stream::>>(); task::spawn(proc() { calc(children / 2, &wait_chan); @@ -27,14 +27,14 @@ fn calc(children: uint, parent_wait_chan: &Sender>>) { wait_port }); - let child_start_chans: ~[Sender>] = + let child_start_chans: Vec>> = wait_ports.move_iter().map(|port| port.recv()).collect(); let (start_port, start_chan) = stream::>(); parent_wait_chan.send(start_chan); let parent_result_chan: Sender = start_port.recv(); - let child_sum_ports: ~[Receiver] = + let child_sum_ports: Vec> = child_start_chans.move_iter().map(|child_start_chan| { let (child_sum_port, child_sum_chan) = stream::(); child_start_chan.send(child_sum_chan); @@ -49,9 +49,9 @@ fn calc(children: uint, parent_wait_chan: &Sender>>) { fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"30"] + vec!(~"", ~"30") } else if args.len() <= 1u { - ~[~"", ~"10"] + vec!(~"", ~"10") } else { args }; diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/task-perf-spawnalot.rs index e322aceb5e6..3a45e88b81a 100644 --- a/src/test/bench/task-perf-spawnalot.rs +++ b/src/test/bench/task-perf-spawnalot.rs @@ -25,9 +25,9 @@ fn g() { } fn main() { let args = os::args(); let args = if os::getenv("RUST_BENCH").is_some() { - ~[~"", ~"400"] + vec!(~"", ~"400") } else if args.len() <= 1u { - ~[~"", ~"10"] + vec!(~"", ~"10") } else { args }; diff --git a/src/test/compile-fail/access-mode-in-closures.rs b/src/test/compile-fail/access-mode-in-closures.rs index ef853f57ef5..e1696f0e63e 100644 --- a/src/test/compile-fail/access-mode-in-closures.rs +++ b/src/test/compile-fail/access-mode-in-closures.rs @@ -9,9 +9,9 @@ // except according to those terms. -struct sty(~[int]); +struct sty(Vec ); -fn unpack(_unpack: |v: &sty| -> ~[int]) {} +fn unpack(_unpack: |v: &sty| -> Vec ) {} fn main() { let _foo = unpack(|s| { diff --git a/src/test/compile-fail/ambig_impl_unify.rs b/src/test/compile-fail/ambig_impl_unify.rs index 1327f69630b..7d842e3d5ab 100644 --- a/src/test/compile-fail/ambig_impl_unify.rs +++ b/src/test/compile-fail/ambig_impl_unify.rs @@ -12,15 +12,15 @@ trait foo { fn foo(&self) -> int; } -impl foo for ~[uint] { +impl foo for Vec { fn foo(&self) -> int {1} //~ NOTE candidate #1 is `~[uint].foo::foo` } -impl foo for ~[int] { +impl foo for Vec { fn foo(&self) -> int {2} //~ NOTE candidate #2 is `~[int].foo::foo` } fn main() { - let x = ~[]; + let x = Vec::new(); x.foo(); //~ ERROR multiple applicable methods in scope } diff --git a/src/test/compile-fail/auto-ref-slice-plus-ref.rs b/src/test/compile-fail/auto-ref-slice-plus-ref.rs index 6a0f5a39202..8810421f6c4 100644 --- a/src/test/compile-fail/auto-ref-slice-plus-ref.rs +++ b/src/test/compile-fail/auto-ref-slice-plus-ref.rs @@ -17,7 +17,7 @@ fn main() { // reference. That would allow creating a mutable pointer to a // temporary, which would be a source of confusion - let mut a = ~[0]; + let mut a = vec!(0); a.test_mut(); //~ ERROR does not implement any method in scope named `test_mut` } diff --git a/src/test/compile-fail/bad-expr-path.rs b/src/test/compile-fail/bad-expr-path.rs index c17baf40d64..6ba5a3333c5 100644 --- a/src/test/compile-fail/bad-expr-path.rs +++ b/src/test/compile-fail/bad-expr-path.rs @@ -12,4 +12,4 @@ mod m1 {} -fn main(args: ~[str]) { log(debug, m1::a); } +fn main(args: vec!(str)) { log(debug, m1::a); } diff --git a/src/test/compile-fail/bad-expr-path2.rs b/src/test/compile-fail/bad-expr-path2.rs index 936f893ae8e..4c85ba07637 100644 --- a/src/test/compile-fail/bad-expr-path2.rs +++ b/src/test/compile-fail/bad-expr-path2.rs @@ -14,4 +14,4 @@ mod m1 { pub mod a {} } -fn main(args: ~[str]) { log(debug, m1::a); } +fn main(args: vec!(str)) { log(debug, m1::a); } diff --git a/src/test/compile-fail/bad-module.rs b/src/test/compile-fail/bad-module.rs index 90164c52bc7..edc118cb039 100644 --- a/src/test/compile-fail/bad-module.rs +++ b/src/test/compile-fail/bad-module.rs @@ -10,4 +10,4 @@ // error-pattern: unresolved name -fn main() { let foo = thing::len(~[]); } +fn main() { let foo = thing::len(Vec::new()); } diff --git a/src/test/compile-fail/borrowck-assign-comp-idx.rs b/src/test/compile-fail/borrowck-assign-comp-idx.rs index 64afb4861c3..2377870c647 100644 --- a/src/test/compile-fail/borrowck-assign-comp-idx.rs +++ b/src/test/compile-fail/borrowck-assign-comp-idx.rs @@ -14,7 +14,7 @@ struct Point { } fn a() { - let mut p = ~[1]; + let mut p = vec!(1); // Create an immutable pointer into p's contents: let q: &int = &p[0]; @@ -30,7 +30,7 @@ fn b() { // here we alias the mutable vector into an imm slice and try to // modify the original: - let mut p = ~[1]; + let mut p = vec!(1); borrow( p, @@ -40,7 +40,7 @@ fn b() { fn c() { // Legal because the scope of the borrow does not include the // modification: - let mut p = ~[1]; + let mut p = vec!(1); borrow(p, ||{}); p[0] = 5; } diff --git a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs index 4fccb5c3bca..a9c4fa9a4b5 100644 --- a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs +++ b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs @@ -28,6 +28,6 @@ fn defer<'r>(x: &'r [&'r str]) -> defer<'r> { } fn main() { - let x = defer(~["Goodbye", "world!"]); //~ ERROR borrowed value does not live long enough + let x = defer(vec!("Goodbye", "world!")); //~ ERROR borrowed value does not live long enough x.x[0]; } diff --git a/src/test/compile-fail/borrowck-loan-vec-content.rs b/src/test/compile-fail/borrowck-loan-vec-content.rs index 0e721d7107f..200d208d140 100644 --- a/src/test/compile-fail/borrowck-loan-vec-content.rs +++ b/src/test/compile-fail/borrowck-loan-vec-content.rs @@ -17,12 +17,12 @@ fn takes_imm_elt(_v: &int, f: ||) { } fn has_mut_vec_and_does_not_try_to_change_it() { - let mut v = ~[1, 2, 3]; + let mut v = vec!(1, 2, 3); takes_imm_elt(&v[0], || {}) } fn has_mut_vec_but_tries_to_change_it() { - let mut v = ~[1, 2, 3]; + let mut v = vec!(1, 2, 3); takes_imm_elt( &v[0], || { //~ ERROR cannot borrow `v` as mutable diff --git a/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs b/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs index e1e0bb4ceca..30ab71ad105 100644 --- a/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs +++ b/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs @@ -16,11 +16,11 @@ struct Foo { } pub fn main() { - let x = ~[ + let x = vec!( Foo { string: ~"foo" }, Foo { string: ~"bar" }, Foo { string: ~"baz" } - ]; + ); let x: &[Foo] = x; match x { [_, ..tail] => { diff --git a/src/test/compile-fail/borrowck-mut-slice-of-imm-vec.rs b/src/test/compile-fail/borrowck-mut-slice-of-imm-vec.rs index ec17976c506..b1ca61ebbcf 100644 --- a/src/test/compile-fail/borrowck-mut-slice-of-imm-vec.rs +++ b/src/test/compile-fail/borrowck-mut-slice-of-imm-vec.rs @@ -13,6 +13,6 @@ fn write(v: &mut [int]) { } fn main() { - let v = ~[1, 2, 3]; + let v = vec!(1, 2, 3); write(v); //~ ERROR cannot borrow } diff --git a/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs b/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs index 00252069f2d..22e35e4a84c 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs @@ -9,7 +9,7 @@ // except according to those terms. fn a() -> &[int] { - let vec = ~[1, 2, 3, 4]; + let vec = vec!(1, 2, 3, 4); let vec: &[int] = vec; //~ ERROR does not live long enough let tail = match vec { [_, ..tail] => tail, @@ -19,7 +19,7 @@ fn a() -> &[int] { } fn b() -> &[int] { - let vec = ~[1, 2, 3, 4]; + let vec = vec!(1, 2, 3, 4); let vec: &[int] = vec; //~ ERROR does not live long enough let init = match vec { [..init, _] => init, @@ -29,7 +29,7 @@ fn b() -> &[int] { } fn c() -> &[int] { - let vec = ~[1, 2, 3, 4]; + let vec = vec!(1, 2, 3, 4); let vec: &[int] = vec; //~ ERROR does not live long enough let slice = match vec { [_, ..slice, _] => slice, diff --git a/src/test/compile-fail/borrowck-vec-pattern-loan-from-mut.rs b/src/test/compile-fail/borrowck-vec-pattern-loan-from-mut.rs index d3f23a34978..ca28b3cfd45 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-loan-from-mut.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-loan-from-mut.rs @@ -9,7 +9,7 @@ // except according to those terms. fn a() { - let mut v = ~[1, 2, 3]; + let mut v = vec!(1, 2, 3); let vb: &mut [int] = v; match vb { [_a, ..tail] => { diff --git a/src/test/compile-fail/borrowck-vec-pattern-nesting.rs b/src/test/compile-fail/borrowck-vec-pattern-nesting.rs index b85c2a82aea..a3b0c0ea359 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-nesting.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-nesting.rs @@ -18,7 +18,7 @@ fn a() { } fn b() { - let mut vec = ~[~1, ~2, ~3]; + let mut vec = vec!(~1, ~2, ~3); let vec: &mut [~int] = vec; match vec { [.._b] => { @@ -28,7 +28,7 @@ fn b() { } fn c() { - let mut vec = ~[~1, ~2, ~3]; + let mut vec = vec!(~1, ~2, ~3); let vec: &mut [~int] = vec; match vec { [_a, .._b] => { @@ -46,7 +46,7 @@ fn c() { } fn d() { - let mut vec = ~[~1, ~2, ~3]; + let mut vec = vec!(~1, ~2, ~3); let vec: &mut [~int] = vec; match vec { [.._a, _b] => { @@ -58,7 +58,7 @@ fn d() { } fn e() { - let mut vec = ~[~1, ~2, ~3]; + let mut vec = vec!(~1, ~2, ~3); let vec: &mut [~int] = vec; match vec { [_a, _b, _c] => {} //~ ERROR cannot move out diff --git a/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs b/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs index ea972e8238a..7b3db0151f6 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs @@ -9,7 +9,7 @@ // except according to those terms. fn a() -> &int { - let vec = ~[1, 2, 3, 4]; + let vec = vec!(1, 2, 3, 4); let vec: &[int] = vec; //~ ERROR `vec[..]` does not live long enough let tail = match vec { [_a, ..tail] => &tail[0], diff --git a/src/test/compile-fail/drop-on-non-struct.rs b/src/test/compile-fail/drop-on-non-struct.rs index 0d01fe4e8c7..8ab78648ff5 100644 --- a/src/test/compile-fail/drop-on-non-struct.rs +++ b/src/test/compile-fail/drop-on-non-struct.rs @@ -10,7 +10,7 @@ #[feature(managed_boxes)]; -type Foo = ~[u8]; +type Foo = Vec ; impl Drop for Foo { //~ ERROR the Drop trait may only be implemented //~^ ERROR cannot provide an extension implementation diff --git a/src/test/compile-fail/empty-vec-trailing-comma.rs b/src/test/compile-fail/empty-vec-trailing-comma.rs index 9191c866afd..41cb351cdcd 100644 --- a/src/test/compile-fail/empty-vec-trailing-comma.rs +++ b/src/test/compile-fail/empty-vec-trailing-comma.rs @@ -9,5 +9,5 @@ // except according to those terms. fn main() { - let v = ~[,]; //~ ERROR unexpected token: `,` + let v = vec!(); //~ ERROR unexpected token: `,` } diff --git a/src/test/compile-fail/evec-subtyping.rs b/src/test/compile-fail/evec-subtyping.rs index 9a0227b7d31..562a5580c00 100644 --- a/src/test/compile-fail/evec-subtyping.rs +++ b/src/test/compile-fail/evec-subtyping.rs @@ -10,10 +10,10 @@ #[feature(managed_boxes)]; -fn wants_uniq(x: ~[uint]) { } +fn wants_uniq(x: Vec ) { } fn wants_three(x: [uint, ..3]) { } -fn has_uniq(x: ~[uint]) { +fn has_uniq(x: Vec ) { wants_uniq(x); wants_three(x); //~ ERROR [] storage differs: expected `3` but found `~` } diff --git a/src/test/compile-fail/import.rs b/src/test/compile-fail/import.rs index 7f3319e6d90..c5c6a375959 100644 --- a/src/test/compile-fail/import.rs +++ b/src/test/compile-fail/import.rs @@ -14,4 +14,4 @@ mod zed { pub fn bar() { println!("bar"); } } -fn main(args: ~[str]) { bar(); } +fn main(args: vec!(str)) { bar(); } diff --git a/src/test/compile-fail/import2.rs b/src/test/compile-fail/import2.rs index 721176e2e88..0024f78009d 100644 --- a/src/test/compile-fail/import2.rs +++ b/src/test/compile-fail/import2.rs @@ -15,4 +15,4 @@ mod baz {} mod zed { pub fn bar() { println!("bar3"); } } -fn main(args: ~[str]) { bar(); } +fn main(args: vec!(str)) { bar(); } diff --git a/src/test/compile-fail/import3.rs b/src/test/compile-fail/import3.rs index bd07433eeb0..0a7827587a6 100644 --- a/src/test/compile-fail/import3.rs +++ b/src/test/compile-fail/import3.rs @@ -11,4 +11,4 @@ // error-pattern: unresolved use main::bar; -fn main(args: ~[str]) { println!("foo"); } +fn main() { println!("foo"); } diff --git a/src/test/compile-fail/import4.rs b/src/test/compile-fail/import4.rs index af4d0ebe6ba..feb94708520 100644 --- a/src/test/compile-fail/import4.rs +++ b/src/test/compile-fail/import4.rs @@ -13,4 +13,4 @@ mod a { pub use b::foo; } mod b { pub use a::foo; } -fn main(args: ~[str]) { println!("loop"); } +fn main() { println!("loop"); } diff --git a/src/test/compile-fail/infinite-vec-type-recursion.rs b/src/test/compile-fail/infinite-vec-type-recursion.rs index 9f9fd43fcdf..409a5e72fed 100644 --- a/src/test/compile-fail/infinite-vec-type-recursion.rs +++ b/src/test/compile-fail/infinite-vec-type-recursion.rs @@ -10,6 +10,6 @@ // error-pattern: illegal recursive type -type x = ~[x]; +type x = vec!(x); -fn main() { let b: x = ~[]; } +fn main() { let b: x = Vec::new(); } diff --git a/src/test/compile-fail/issue-10412.rs b/src/test/compile-fail/issue-10412.rs index 79af6617ab3..e0bac1e9e4a 100644 --- a/src/test/compile-fail/issue-10412.rs +++ b/src/test/compile-fail/issue-10412.rs @@ -10,13 +10,13 @@ trait Serializable<'self, T> { //~ ERROR: no longer a special lifetime - fn serialize(val : &'self T) -> ~[u8]; + fn serialize(val : &'self T) -> Vec ; fn deserialize(repr : &[u8]) -> &'self T; } impl<'self> Serializable for &'self str { - fn serialize(val : &'self str) -> ~[u8] { - ~[1] + fn serialize(val : &'self str) -> Vec { + vec!(1) } fn deserialize(repr: &[u8]) -> &'self str { "hi" diff --git a/src/test/compile-fail/issue-10487.rs b/src/test/compile-fail/issue-10487.rs index 01fb2ea9427..c2f40f56948 100644 --- a/src/test/compile-fail/issue-10487.rs +++ b/src/test/compile-fail/issue-10487.rs @@ -10,6 +10,6 @@ #[feature(managed_boxes)]; -static x: ~[int] = ~[123, 456]; //~ ERROR: static items are not allowed to have owned pointers +static x: Vec = vec!(123, 456); //~ ERROR: static items are not allowed to have owned pointers fn main() {} diff --git a/src/test/compile-fail/issue-1655.rs b/src/test/compile-fail/issue-1655.rs index e2810b854f7..0c2a93e8bfa 100644 --- a/src/test/compile-fail/issue-1655.rs +++ b/src/test/compile-fail/issue-1655.rs @@ -10,12 +10,12 @@ // error-pattern:expected `[` but found `~` mod blade_runner { - #~[doc( + #vec!(doc( brief = "Blade Runner is probably the best movie ever", desc = "I like that in the world of Blade Runner it is always raining, and that it's always night time. And Aliens was also a really good movie. Alien 3 was crap though." - )] + )) } diff --git a/src/test/compile-fail/issue-2149.rs b/src/test/compile-fail/issue-2149.rs index 8d2bdd2d2eb..ed35f3b306b 100644 --- a/src/test/compile-fail/issue-2149.rs +++ b/src/test/compile-fail/issue-2149.rs @@ -9,11 +9,11 @@ // except according to those terms. trait vec_monad { - fn bind(&self, f: |A| -> ~[B]); + fn bind(&self, f: |A| -> Vec ); } -impl vec_monad for ~[A] { - fn bind(&self, f: |A| -> ~[B]) { +impl vec_monad for Vec { + fn bind(&self, f: |A| -> Vec ) { let mut r = fail!(); for elt in self.iter() { r = r + f(*elt); } //~^ ERROR the type of this value must be known diff --git a/src/test/compile-fail/issue-2150.rs b/src/test/compile-fail/issue-2150.rs index b5269519bb7..ca49bd1a48a 100644 --- a/src/test/compile-fail/issue-2150.rs +++ b/src/test/compile-fail/issue-2150.rs @@ -13,7 +13,7 @@ #[allow(dead_code)]; #[allow(deprecated_owned_vector)]; -fn fail_len(v: ~[int]) -> uint { +fn fail_len(v: Vec ) -> uint { let mut i = 3; fail!(); for x in v.iter() { i += 1u; } diff --git a/src/test/compile-fail/issue-2281-part1.rs b/src/test/compile-fail/issue-2281-part1.rs index bb24192445e..9d4a691d4f9 100644 --- a/src/test/compile-fail/issue-2281-part1.rs +++ b/src/test/compile-fail/issue-2281-part1.rs @@ -10,4 +10,4 @@ // error-pattern: unresolved name `foobar`. -fn main(args: ~[str]) { println!("{:?}", foobar); } +fn main() { println!("{:?}", foobar); } diff --git a/src/test/compile-fail/issue-2548.rs b/src/test/compile-fail/issue-2548.rs index 19bd9b2476b..c2f48b7ca5b 100644 --- a/src/test/compile-fail/issue-2548.rs +++ b/src/test/compile-fail/issue-2548.rs @@ -38,8 +38,8 @@ fn main() { { let mut res = foo(x); - let mut v = ~[]; - v = ~[(res)] + v; //~ failed to find an implementation of trait + let mut v = Vec::new(); + v = vec!((res)) + v; //~ failed to find an implementation of trait assert_eq!(v.len(), 2); } diff --git a/src/test/compile-fail/issue-2590.rs b/src/test/compile-fail/issue-2590.rs index a2bb583a3d6..94c155fce9b 100644 --- a/src/test/compile-fail/issue-2590.rs +++ b/src/test/compile-fail/issue-2590.rs @@ -9,15 +9,15 @@ // except according to those terms. struct parser { - tokens: ~[int], + tokens: Vec , } trait parse { - fn parse(&self) -> ~[int]; + fn parse(&self) -> Vec ; } impl parse for parser { - fn parse(&self) -> ~[int] { + fn parse(&self) -> Vec { self.tokens //~ ERROR cannot move out of dereference of `&`-pointer } } diff --git a/src/test/compile-fail/issue-3044.rs b/src/test/compile-fail/issue-3044.rs index 5fab2ed195c..3b1bceb453a 100644 --- a/src/test/compile-fail/issue-3044.rs +++ b/src/test/compile-fail/issue-3044.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let needlesArr: ~[char] = ~['a', 'f']; + let needlesArr: Vec = vec!('a', 'f'); needlesArr.iter().fold(|x, y| { }); //~^^ ERROR this function takes 2 parameters but 1 parameter was supplied diff --git a/src/test/compile-fail/issue-7573.rs b/src/test/compile-fail/issue-7573.rs index 3b8eda8f783..c78e1a15058 100644 --- a/src/test/compile-fail/issue-7573.rs +++ b/src/test/compile-fail/issue-7573.rs @@ -23,7 +23,7 @@ fn new(s: &str) -> CrateId { } pub fn remove_package_from_database() { - let mut lines_to_use: ~[&CrateId] = ~[]; //~ ERROR cannot infer an appropriate lifetime + let mut lines_to_use: Vec<&CrateId> = Vec::new(); //~ ERROR cannot infer an appropriate lifetime let push_id = |installed_id: &CrateId| { lines_to_use.push(installed_id); }; diff --git a/src/test/compile-fail/issue-8727.rs b/src/test/compile-fail/issue-8727.rs index be676becd5a..4c9f4039723 100644 --- a/src/test/compile-fail/issue-8727.rs +++ b/src/test/compile-fail/issue-8727.rs @@ -15,15 +15,15 @@ struct Data(~Option); -fn generic( _ : ~[(Data,T)] ) { +fn generic( _ : Vec<(Data,T)> ) { //~^ ERROR reached the recursion limit during monomorphization - let rec : ~[(Data,(bool,T))] = ~[]; + let rec : Vec<(Data,(bool,T))> = Vec::new(); generic( rec ); } fn main () { // Use generic at least once to trigger instantiation. - let input : ~[(Data,())] = ~[]; + let input : Vec<(Data,())> = Vec::new(); generic(input); } diff --git a/src/test/compile-fail/kindck-freeze.rs b/src/test/compile-fail/kindck-freeze.rs index 474c1b1d3cf..bf10a029024 100644 --- a/src/test/compile-fail/kindck-freeze.rs +++ b/src/test/compile-fail/kindck-freeze.rs @@ -27,7 +27,7 @@ fn test<'a,T,U:Freeze>(_: &'a int) { // ~ pointers are ok assert_freeze::<~int>(); assert_freeze::<~str>(); - assert_freeze::<~[int]>(); + assert_freeze:: >(); // but not if they own a bad thing assert_freeze::<~&'a mut int>(); //~ ERROR does not fulfill `Freeze` diff --git a/src/test/compile-fail/kindck-pod.rs b/src/test/compile-fail/kindck-pod.rs index 60de67e214c..94902d4e68e 100644 --- a/src/test/compile-fail/kindck-pod.rs +++ b/src/test/compile-fail/kindck-pod.rs @@ -40,7 +40,7 @@ fn test<'a,T,U:Pod>(_: &'a int) { // ~ pointers are not ok assert_pod::<~int>(); //~ ERROR does not fulfill `Pod` assert_pod::<~str>(); //~ ERROR does not fulfill `Pod` - assert_pod::<~[int]>(); //~ ERROR does not fulfill `Pod` + assert_pod:: >(); //~ ERROR does not fulfill `Pod` assert_pod::<~&'a mut int>(); //~ ERROR does not fulfill `Pod` // borrowed object types are generally ok diff --git a/src/test/compile-fail/kindck-send.rs b/src/test/compile-fail/kindck-send.rs index bfef15ea173..829bdaa5332 100644 --- a/src/test/compile-fail/kindck-send.rs +++ b/src/test/compile-fail/kindck-send.rs @@ -30,7 +30,7 @@ fn test<'a,T,U:Send>(_: &'a int) { // ~ pointers are ok assert_send::<~int>(); assert_send::<~str>(); - assert_send::<~[int]>(); + assert_send:: >(); // but not if they own a bad thing assert_send::<~&'a int>(); //~ ERROR does not fulfill `Send` diff --git a/src/test/compile-fail/lint-heap-memory.rs b/src/test/compile-fail/lint-heap-memory.rs index 4c178cdf65c..5391cd475aa 100644 --- a/src/test/compile-fail/lint-heap-memory.rs +++ b/src/test/compile-fail/lint-heap-memory.rs @@ -25,7 +25,7 @@ fn main() { @2; //~ ERROR type uses managed ~2; //~ ERROR type uses owned - ~[1]; //~ ERROR type uses owned + vec!(1); //~ ERROR type uses owned //~^ ERROR type uses owned fn g(_: ~Clone) {} //~ ERROR type uses owned ~""; //~ ERROR type uses owned diff --git a/src/test/compile-fail/lint-unused-mut-variables.rs b/src/test/compile-fail/lint-unused-mut-variables.rs index 6b6311739f0..275b37d9b7e 100644 --- a/src/test/compile-fail/lint-unused-mut-variables.rs +++ b/src/test/compile-fail/lint-unused-mut-variables.rs @@ -21,7 +21,7 @@ fn main() { let mut a = 3; //~ ERROR: variable does not need to be mutable let mut a = 2; //~ ERROR: variable does not need to be mutable let mut b = 3; //~ ERROR: variable does not need to be mutable - let mut a = ~[3]; //~ ERROR: variable does not need to be mutable + let mut a = vec!(3); //~ ERROR: variable does not need to be mutable let (mut a, b) = (1, 2); //~ ERROR: variable does not need to be mutable match 30 { @@ -34,9 +34,9 @@ fn what(mut foo: int) {} //~ ERROR: variable does not need to be mutable // positive cases let mut a = 2; a = 3; - let mut a = ~[]; + let mut a = Vec::new(); a.push(3); - let mut a = ~[]; + let mut a = Vec::new(); callback(|| { a.push(3); }); @@ -63,5 +63,5 @@ fn callback(f: ||) {} #[allow(unused_mut)] fn foo(mut a: int) { let mut a = 3; - let mut b = ~[2]; + let mut b = vec!(2); } diff --git a/src/test/compile-fail/lint-unused-unsafe.rs b/src/test/compile-fail/lint-unused-unsafe.rs index de01a711a3e..2bf784faf00 100644 --- a/src/test/compile-fail/lint-unused-unsafe.rs +++ b/src/test/compile-fail/lint-unused-unsafe.rs @@ -50,7 +50,7 @@ fn good2() { sure that when purity is inherited that the source of the unsafe-ness is tracked correctly */ unsafe { - unsafe fn what() -> ~[~str] { fail!() } + unsafe fn what() -> Vec<~str> { fail!() } callback(|| { what(); diff --git a/src/test/compile-fail/liveness-issue-2163.rs b/src/test/compile-fail/liveness-issue-2163.rs index 05a6c0f6bbd..3d601957754 100644 --- a/src/test/compile-fail/liveness-issue-2163.rs +++ b/src/test/compile-fail/liveness-issue-2163.rs @@ -11,7 +11,7 @@ use std::slice; fn main() { - let a: ~[int] = ~[]; + let a: Vec = Vec::new(); a.iter().advance(|_| -> bool { //~^ ERROR mismatched types }); diff --git a/src/test/compile-fail/match-vec-invalid.rs b/src/test/compile-fail/match-vec-invalid.rs index 5a50cb48da6..389e26aa400 100644 --- a/src/test/compile-fail/match-vec-invalid.rs +++ b/src/test/compile-fail/match-vec-invalid.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let a = ~[]; + let a = Vec::new(); match a { [1, ..tail, ..tail] => {}, //~ ERROR: unexpected token: `..` _ => () diff --git a/src/test/compile-fail/match-vec-unreachable.rs b/src/test/compile-fail/match-vec-unreachable.rs index e117e0a1c7a..31fdb220263 100644 --- a/src/test/compile-fail/match-vec-unreachable.rs +++ b/src/test/compile-fail/match-vec-unreachable.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let x: ~[(int, int)] = ~[]; + let x: Vec<(int, int)> = Vec::new(); let x: &[(int, int)] = x; match x { [a, (2, 3), _] => (), @@ -17,7 +17,7 @@ fn main() { _ => () } - let x: ~[~str] = ~[~"foo", ~"bar", ~"baz"]; + let x: Vec<~str> = vec!(~"foo", ~"bar", ~"baz"); let x: &[~str] = x; match x { [a, _, _, ..] => { println!("{}", a); } @@ -25,7 +25,7 @@ fn main() { _ => { } } - let x: ~[char] = ~['a', 'b', 'c']; + let x: Vec = vec!('a', 'b', 'c'); let x: &[char] = x; match x { ['a', 'b', 'c', .._tail] => {} diff --git a/src/test/compile-fail/moves-based-on-type-access-to-field.rs b/src/test/compile-fail/moves-based-on-type-access-to-field.rs index 1557b290c2c..59bdc0b8a4d 100644 --- a/src/test/compile-fail/moves-based-on-type-access-to-field.rs +++ b/src/test/compile-fail/moves-based-on-type-access-to-field.rs @@ -22,7 +22,7 @@ fn f10() { } fn f20() { - let x = ~[~"hi"]; + let x = vec!(~"hi"); consume(x[0]); touch(&x[0]); //~ ERROR use of partially moved value: `x` } diff --git a/src/test/compile-fail/moves-based-on-type-exprs.rs b/src/test/compile-fail/moves-based-on-type-exprs.rs index 4c62e47965e..cfc57af092c 100644 --- a/src/test/compile-fail/moves-based-on-type-exprs.rs +++ b/src/test/compile-fail/moves-based-on-type-exprs.rs @@ -30,7 +30,7 @@ fn f20() { } fn f21() { - let x = ~[1, 2, 3]; + let x = vec!(1, 2, 3); let _y = (x[0], 3); touch(&x); } @@ -78,24 +78,24 @@ fn f70() { fn f80() { let x = ~"hi"; - let _y = ~[x]; + let _y = vec!(x); touch(&x); //~ ERROR use of moved value: `x` } fn f100() { - let x = ~[~"hi"]; + let x = vec!(~"hi"); let _y = x[0]; touch(&x); //~ ERROR use of partially moved value: `x` } fn f110() { - let x = ~[~"hi"]; + let x = vec!(~"hi"); let _y = [x[0], ..1]; touch(&x); //~ ERROR use of partially moved value: `x` } fn f120() { - let mut x = ~[~"hi", ~"ho"]; + let mut x = vec!(~"hi", ~"ho"); x.swap(0, 1); touch(&x[0]); touch(&x[1]); diff --git a/src/test/compile-fail/nested-ty-params.rs b/src/test/compile-fail/nested-ty-params.rs index daf92b700e7..7b7ce6bee2f 100644 --- a/src/test/compile-fail/nested-ty-params.rs +++ b/src/test/compile-fail/nested-ty-params.rs @@ -9,7 +9,7 @@ // except according to those terms. // error-pattern:attempt to use a type argument out of scope -fn hd(v: ~[U]) -> U { +fn hd(v: Vec ) -> U { fn hd1(w: [U]) -> U { return w[0]; } return hd1(v); diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs index 02e1f82e709..7311a0d5302 100644 --- a/src/test/compile-fail/no-capture-arc.rs +++ b/src/test/compile-fail/no-capture-arc.rs @@ -16,7 +16,7 @@ use std::task; fn main() { - let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; + let v = vec!(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); let arc_v = Arc::new(v); task::spawn(proc() { diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs index 5fed317fb09..115be7e1485 100644 --- a/src/test/compile-fail/no-reuse-move-arc.rs +++ b/src/test/compile-fail/no-reuse-move-arc.rs @@ -14,7 +14,7 @@ use std::task; fn main() { - let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; + let v = vec!(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); let arc_v = Arc::new(v); task::spawn(proc() { diff --git a/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs b/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs index a4eba4b4cbf..162b84d6cec 100644 --- a/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs +++ b/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs @@ -11,6 +11,6 @@ enum State { ST_NULL, ST_WHITESPACE } fn main() { - ~[ST_NULL, ..(ST_WHITESPACE as uint)]; + vec!(ST_NULL, ..(ST_WHITESPACE as uint)); //~^ ERROR expected constant integer for repeat count but found variable } diff --git a/src/test/compile-fail/non-copyable-void.rs b/src/test/compile-fail/non-copyable-void.rs index 64d29a55756..bd9547d5e1c 100644 --- a/src/test/compile-fail/non-copyable-void.rs +++ b/src/test/compile-fail/non-copyable-void.rs @@ -11,7 +11,7 @@ use std::libc; fn main() { - let x : *~[int] = &~[1,2,3]; + let x : *Vec = &vec!(1,2,3); let y : *libc::c_void = x as *libc::c_void; unsafe { let _z = (*y).clone(); diff --git a/src/test/compile-fail/non-exhaustive-match.rs b/src/test/compile-fail/non-exhaustive-match.rs index 0d65bc90eb5..3bed415600f 100644 --- a/src/test/compile-fail/non-exhaustive-match.rs +++ b/src/test/compile-fail/non-exhaustive-match.rs @@ -35,7 +35,7 @@ fn main() { (_, a) => {} (b, b) => {} } - let vec = ~[Some(42), None, Some(21)]; + let vec = vec!(Some(42), None, Some(21)); let vec: &[Option] = vec; match vec { //~^ ERROR non-exhaustive patterns: vectors of length 0 not covered @@ -43,13 +43,13 @@ fn main() { [Some(..), Some(..), ..tail] => {} [None] => {} } - let vec = ~[1]; + let vec = vec!(1); let vec: &[int] = vec; match vec { [_, ..tail] => (), [] => () } - let vec = ~[0.5]; + let vec = vec!(0.5); let vec: &[f32] = vec; match vec { //~ ERROR non-exhaustive patterns: vectors of length 4 not covered [0.1, 0.2, 0.3] => (), @@ -57,7 +57,7 @@ fn main() { [0.1] => (), [] => () } - let vec = ~[Some(42), None, Some(21)]; + let vec = vec!(Some(42), None, Some(21)); let vec: &[Option] = vec; match vec { [Some(..), None, ..tail] => {} diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs index 3e4b2502fd0..a7340df83b4 100644 --- a/src/test/compile-fail/pattern-tyvar-2.rs +++ b/src/test/compile-fail/pattern-tyvar-2.rs @@ -9,7 +9,7 @@ // except according to those terms. -enum bar { t1((), Option<~[int]>), t2, } +enum bar { t1((), Option>), t2, } // n.b. my change changes this error message, but I think it's right -- tjc fn foo(t: bar) -> int { match t { t1(_, Some(x)) => { return x * 3; } _ => { fail!(); } } } diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs index 22cc9fd2831..e1566e7c897 100644 --- a/src/test/compile-fail/pattern-tyvar.rs +++ b/src/test/compile-fail/pattern-tyvar.rs @@ -10,7 +10,7 @@ // error-pattern: mismatched types -enum bar { t1((), Option<~[int]>), t2, } +enum bar { t1((), Option >), t2, } fn foo(t: bar) { match t { diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs index 09cac75baa0..27201b76813 100644 --- a/src/test/compile-fail/qquote-1.rs +++ b/src/test/compile-fail/qquote-1.rs @@ -33,7 +33,7 @@ trait fake_ext_ctxt { type fake_session = parse::parse_sess; impl fake_ext_ctxt for fake_session { - fn cfg() -> ast::CrateConfig { ~[] } + fn cfg() -> ast::CrateConfig { Vec::new() } fn parse_sess() -> parse::parse_sess { self } fn call_site() -> span { codemap::span { diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs index 82d0cb2e198..97225c863e5 100644 --- a/src/test/compile-fail/qquote-2.rs +++ b/src/test/compile-fail/qquote-2.rs @@ -30,7 +30,7 @@ trait fake_ext_ctxt { type fake_session = parse::parse_sess; impl fake_ext_ctxt for fake_session { - fn cfg() -> ast::CrateConfig { ~[] } + fn cfg() -> ast::CrateConfig { Vec::new() } fn parse_sess() -> parse::parse_sess { self } fn call_site() -> span { codemap::span { diff --git a/src/test/compile-fail/regions-escape-loop-via-vec.rs b/src/test/compile-fail/regions-escape-loop-via-vec.rs index ccfcc52945d..7d9629a5220 100644 --- a/src/test/compile-fail/regions-escape-loop-via-vec.rs +++ b/src/test/compile-fail/regions-escape-loop-via-vec.rs @@ -11,7 +11,7 @@ // The type of `y` ends up getting inferred to the type of the block. fn broken() { let mut x = 3; - let mut _y = ~[&mut x]; + let mut _y = vec!(&mut x); while x < 10 { let mut z = x; _y.push(&mut z); //~ ERROR `z` does not live long enough diff --git a/src/test/compile-fail/repeat_count.rs b/src/test/compile-fail/repeat_count.rs index 579575e2008..08c8eba696d 100644 --- a/src/test/compile-fail/repeat_count.rs +++ b/src/test/compile-fail/repeat_count.rs @@ -12,5 +12,5 @@ fn main() { let n = 1; - let a = ~[0, ..n]; //~ ERROR expected constant integer for repeat count but found variable + let a = vec!(0, ..n); //~ ERROR expected constant integer for repeat count but found variable } diff --git a/src/test/compile-fail/seq-args.rs b/src/test/compile-fail/seq-args.rs index 35c18c49547..b4929eacf3d 100644 --- a/src/test/compile-fail/seq-args.rs +++ b/src/test/compile-fail/seq-args.rs @@ -11,7 +11,7 @@ fn main() { trait seq { } -impl seq for ~[T] { //~ ERROR wrong number of type arguments +impl seq for Vec { //~ ERROR wrong number of type arguments /* ... */ } impl seq for u32 { diff --git a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs index 0fc3b3912b1..a135af29356 100644 --- a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs +++ b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs @@ -13,7 +13,7 @@ #[no_implicit_prelude]; -fn last(v: ~[&T]) -> std::option::Option { +fn last(v: Vec<&T> ) -> std::option::Option { fail!(); } diff --git a/src/test/compile-fail/uninstantiable-fixed-length-vec.rs b/src/test/compile-fail/uninstantiable-fixed-length-vec.rs index bb2c3247e03..a44010366c8 100644 --- a/src/test/compile-fail/uninstantiable-fixed-length-vec.rs +++ b/src/test/compile-fail/uninstantiable-fixed-length-vec.rs @@ -14,10 +14,10 @@ // ~ to avoid infinite size. struct Uninstantiable { //~ ERROR cannot be instantiated without an instance of itself - p: ~[Uninstantiable, .. 1] + p: vec!(Uninstantiable, .. 1) } -struct Instantiable { p: ~[Instantiable, .. 0] } +struct Instantiable { p: vec!(Instantiable, .. 0) } fn main() { diff --git a/src/test/compile-fail/unique-vec-res.rs b/src/test/compile-fail/unique-vec-res.rs index a77d1b06f17..c76a6f2453e 100644 --- a/src/test/compile-fail/unique-vec-res.rs +++ b/src/test/compile-fail/unique-vec-res.rs @@ -25,14 +25,14 @@ fn drop(&mut self) { } } -fn f(_i: ~[T], _j: ~[T]) { +fn f(_i: Vec , _j: Vec ) { } fn main() { let i1 = @Cell::new(0); let i2 = @Cell::new(1); - let r1 = ~[~r { i: i1 }]; - let r2 = ~[~r { i: i2 }]; + let r1 = vec!(~r { i: i1 }); + let r2 = vec!(~r { i: i2 }); f(r1.clone(), r2.clone()); //~^ ERROR failed to find an implementation of println!("{:?}", (r2, i1.get())); diff --git a/src/test/compile-fail/use-after-move-implicity-coerced-object.rs b/src/test/compile-fail/use-after-move-implicity-coerced-object.rs index 085ed5db6df..4d57470a721 100644 --- a/src/test/compile-fail/use-after-move-implicity-coerced-object.rs +++ b/src/test/compile-fail/use-after-move-implicity-coerced-object.rs @@ -23,8 +23,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { } struct List { - list: ~[~ToStr] -} + list: Vec<~ToStr> } impl List { fn push(&mut self, n: ~ToStr) { @@ -34,7 +33,7 @@ fn push(&mut self, n: ~ToStr) { fn main() { let n = ~Number { n: 42 }; - let mut l = ~List { list: ~[] }; + let mut l = ~List { list: Vec::new() }; l.push(n); let x = n.to_str(); //~^ ERROR: use of moved value: `n` diff --git a/src/test/compile-fail/vec-field.rs b/src/test/compile-fail/vec-field.rs deleted file mode 100644 index 19052d923e9..00000000000 --- a/src/test/compile-fail/vec-field.rs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// error-pattern:attempted access of field `some_field_name` on type `~[int]` -// issue #367 - -fn f() { - let v = ~[1i]; - println!("{}", v.some_field_name); //type error -} - -fn main() { } diff --git a/src/test/compile-fail/vec-mut-iter-borrow.rs b/src/test/compile-fail/vec-mut-iter-borrow.rs index 72dbd82e947..a3c7fc2d4c8 100644 --- a/src/test/compile-fail/vec-mut-iter-borrow.rs +++ b/src/test/compile-fail/vec-mut-iter-borrow.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let mut xs = ~[1, 2, 3, 4]; + let mut xs = vec!(1, 2, 3, 4); for x in xs.mut_iter() { xs.push(1) //~ ERROR cannot borrow `xs` diff --git a/src/test/compile-fail/vec-res-add.rs b/src/test/compile-fail/vec-res-add.rs index d93fe4f48d0..8da9511b493 100644 --- a/src/test/compile-fail/vec-res-add.rs +++ b/src/test/compile-fail/vec-res-add.rs @@ -22,8 +22,8 @@ fn drop(&mut self) {} fn main() { // This can't make sense as it would copy the classes - let i = ~[r(0)]; - let j = ~[r(1)]; + let i = vec!(r(0)); + let j = vec!(r(1)); let k = i + j; println!("{}", j); } diff --git a/src/test/compile-fail/vector-no-ann.rs b/src/test/compile-fail/vector-no-ann.rs index 4dc34905227..be226b2e16e 100644 --- a/src/test/compile-fail/vector-no-ann.rs +++ b/src/test/compile-fail/vector-no-ann.rs @@ -9,5 +9,5 @@ // except according to those terms. fn main() { - let _foo = ~[]; //~ ERROR unconstrained type + let _foo = Vec::new(); //~ ERROR unconstrained type } diff --git a/src/test/compile-fail/writing-to-immutable-vec.rs b/src/test/compile-fail/writing-to-immutable-vec.rs index faa3d6cfe47..987a3c1674c 100644 --- a/src/test/compile-fail/writing-to-immutable-vec.rs +++ b/src/test/compile-fail/writing-to-immutable-vec.rs @@ -9,6 +9,6 @@ // except according to those terms. fn main() { - let v: ~[int] = ~[1, 2, 3]; + let v: Vec = vec!(1, 2, 3); v[1] = 4; //~ ERROR cannot assign } diff --git a/src/test/debug-info/boxed-vec.rs b/src/test/debug-info/boxed-vec.rs index 810f0d2468a..5ddce3c60e1 100644 --- a/src/test/debug-info/boxed-vec.rs +++ b/src/test/debug-info/boxed-vec.rs @@ -26,7 +26,7 @@ fn main() { - let unique: ~[i64] = ~[10, 11, 12, 13]; + let unique: Vec = vec!(10, 11, 12, 13); zzz(); } diff --git a/src/test/debug-info/issue11600.rs b/src/test/debug-info/issue11600.rs index 83ad5c4c7fa..baf020672ec 100644 --- a/src/test/debug-info/issue11600.rs +++ b/src/test/debug-info/issue11600.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let args : ~[~str] = ::std::os::args(); + let args : Vec<~str> = ::std::os::args(); ::std::io::println(args[0]); } diff --git a/src/test/debug-info/managed-pointer-within-unique-vec.rs b/src/test/debug-info/managed-pointer-within-unique-vec.rs index 5b9ab0e8ce5..50f39461392 100644 --- a/src/test/debug-info/managed-pointer-within-unique-vec.rs +++ b/src/test/debug-info/managed-pointer-within-unique-vec.rs @@ -33,7 +33,7 @@ fn main() { - let unique: ~[@i64] = ~[@10, @11, @12, @13]; + let unique: Vec<@i64> = vec!(@10, @11, @12, @13); zzz(); } diff --git a/src/test/pretty/block-disambig.rs b/src/test/pretty/block-disambig.rs index 3f789fa456a..8e4427d9dd4 100644 --- a/src/test/pretty/block-disambig.rs +++ b/src/test/pretty/block-disambig.rs @@ -59,9 +59,9 @@ fn test9() { } fn test10() -> int { - let regs = @~[0]; + let regs = @vec!(0); match true { true => { } _ => { } } (*regs)[0] } -fn test11() -> ~[int] { if true { } ~[1, 2] } +fn test11() -> Vec { if true { } vec!(1, 2) } diff --git a/src/test/pretty/match-naked-expr-medium.rs b/src/test/pretty/match-naked-expr-medium.rs index 4ae129c7b73..56ffc41c76c 100644 --- a/src/test/pretty/match-naked-expr-medium.rs +++ b/src/test/pretty/match-naked-expr-medium.rs @@ -14,7 +14,7 @@ fn main() { let x = Some(3); let _y = match x { - Some(_) => ~[~"some(_)", ~"not", ~"SO", ~"long", ~"string"], - None => ~[~"none"] + Some(_) => vec!(~"some(_)", ~"not", ~"SO", ~"long", ~"string"), + None => vec!(~"none") }; } diff --git a/src/test/pretty/vec-comments.rs b/src/test/pretty/vec-comments.rs index a09e341a940..d685ad49a27 100644 --- a/src/test/pretty/vec-comments.rs +++ b/src/test/pretty/vec-comments.rs @@ -13,27 +13,27 @@ // pp-exact:vec-comments.pp fn main() { let _v1 = - ~[ + vec!( // Comment 0, // Comment 1, // Comment - 2]; + 2); let _v2 = - ~[0, // Comment + vec!(0, // Comment 1, // Comment - 2]; // Comment + 2); // Comment let _v3 = - ~[ + vec!( /* Comment */ 0, /* Comment */ 1, /* Comment */ - 2]; + 2); let _v4 = - ~[0, /* Comment */ + vec!(0, /* Comment */ 1, /* Comment */ - 2]; /* Comment */ + 2); /* Comment */ } diff --git a/src/test/pretty/vec-type.rs b/src/test/pretty/vec-type.rs index d84f43d7005..5e37123023c 100644 --- a/src/test/pretty/vec-type.rs +++ b/src/test/pretty/vec-type.rs @@ -10,6 +10,6 @@ // pp-exact:vec-type.pp -fn f1(_x: ~[int]) { } +fn f1(_x: Vec ) { } -fn g1() { f1(~[1, 2, 3]); } +fn g1() { f1(vec!(1, 2, 3)); } diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs b/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs index daec43ea993..8ca317e1dd7 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs @@ -14,7 +14,7 @@ use std::uint; fn main() { - let x = ~[1u,2u,3u]; + let x = vec!(1u,2u,3u); // This should cause a bounds-check failure, but may not if we do our // bounds checking by comparing a scaled index value to the vector's diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs b/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs index e262d088ba0..6106abc76c3 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs @@ -15,7 +15,7 @@ #[cfg(target_arch="x86")] fn main() { - let x = ~[1u,2u,3u]; + let x = vec!(1u,2u,3u); // This should cause a bounds-check failure, but may not if we do our // bounds checking by truncating the index value to the size of the @@ -29,12 +29,12 @@ fn main() { idx as uint); // This should fail. - println!("ov3 0x%x", x[idx]); + println!("ov3 0x%x", x.as_slice()[idx]); } #[cfg(target_arch="x86_64")] fn main() { // This version just fails anyways, for symmetry on 64-bit hosts. - let x = ~[1u,2u,3u]; - println!("ov3 0x%x", x[200]); + let x = vec!(1u,2u,3u); + error!("ov3 0x%x", x.as_slice()[200]); } diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow.rs b/src/test/run-fail/bug-2470-bounds-check-overflow.rs index 152f90f9740..29e57925af5 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow.rs @@ -20,7 +20,7 @@ fn main() { // address of the 0th cell in the array (even though the index is // huge). - let x = ~[1u,2u,3u]; + let x = vec!(1u,2u,3u); let base = x.as_ptr() as uint; let idx = base / mem::size_of::(); diff --git a/src/test/run-fail/issue-3029.rs b/src/test/run-fail/issue-3029.rs index 44364007c06..d51865d782c 100644 --- a/src/test/run-fail/issue-3029.rs +++ b/src/test/run-fail/issue-3029.rs @@ -14,8 +14,8 @@ // error-pattern:so long fn main() { - let mut x = ~[]; - let y = ~[3]; + let mut x = Vec::new(); + let y = vec!(3); fail!("so long"); x.push_all_move(y); ~"good" + ~"bye"; diff --git a/src/test/run-fail/unwind-box-vec.rs b/src/test/run-fail/unwind-box-vec.rs index 957b631abd3..e66b188fac6 100644 --- a/src/test/run-fail/unwind-box-vec.rs +++ b/src/test/run-fail/unwind-box-vec.rs @@ -17,7 +17,7 @@ fn failfn() { } fn main() { - let x = @~[0, 1, 2, 3, 4, 5]; + let x = @vec!(0, 1, 2, 3, 4, 5); failfn(); println!("{:?}", x); } diff --git a/src/test/run-fail/unwind-interleaved.rs b/src/test/run-fail/unwind-interleaved.rs index 365204d5c9e..6f2400ec4f0 100644 --- a/src/test/run-fail/unwind-interleaved.rs +++ b/src/test/run-fail/unwind-interleaved.rs @@ -15,8 +15,8 @@ fn a() { } fn b() { fail!(); } fn main() { - let _x = ~[0]; + let _x = vec!(0); a(); - let _y = ~[0]; + let _y = vec!(0); b(); } diff --git a/src/test/run-fail/unwind-misc-1.rs b/src/test/run-fail/unwind-misc-1.rs index f9abb1566bb..9fb53d0f9e8 100644 --- a/src/test/run-fail/unwind-misc-1.rs +++ b/src/test/run-fail/unwind-misc-1.rs @@ -18,7 +18,7 @@ fn main() { let _count = @0u; let mut map = collections::HashMap::new(); - let mut arr = ~[]; + let mut arr = Vec::new(); for _i in range(0u, 10u) { arr.push(@~"key stuff"); map.insert(arr.clone(), arr + &[@~"value stuff"]); diff --git a/src/test/run-fail/unwind-partial-box.rs b/src/test/run-fail/unwind-partial-box.rs index 7239cad762d..e13c818ee44 100644 --- a/src/test/run-fail/unwind-partial-box.rs +++ b/src/test/run-fail/unwind-partial-box.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -fn f() -> ~[int] { fail!(); } +fn f() -> Vec { fail!(); } // Voodoo. In unwind-alt we had to do this to trigger the bug. Might // have been to do with memory allocation patterns. diff --git a/src/test/run-fail/unwind-partial-unique.rs b/src/test/run-fail/unwind-partial-unique.rs index 6339e72fe46..4dd2b35e2de 100644 --- a/src/test/run-fail/unwind-partial-unique.rs +++ b/src/test/run-fail/unwind-partial-unique.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -fn f() -> ~[int] { fail!(); } +fn f() -> Vec { fail!(); } // Voodoo. In unwind-alt we had to do this to trigger the bug. Might // have been to do with memory allocation patterns. diff --git a/src/test/run-fail/unwind-partial-vec.rs b/src/test/run-fail/unwind-partial-vec.rs index 9560e0275d4..eac4bf54157 100644 --- a/src/test/run-fail/unwind-partial-vec.rs +++ b/src/test/run-fail/unwind-partial-vec.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -fn f() -> ~[int] { fail!(); } +fn f() -> Vec { fail!(); } // Voodoo. In unwind-alt we had to do this to trigger the bug. Might // have been to do with memory allocation patterns. @@ -21,7 +21,7 @@ fn prime() { } fn partial() { - let _x = ~[~[0], f(), ~[0]]; + let _x = vec!(vec!(0), f(), vec!(0)); } fn main() { diff --git a/src/test/run-fail/unwind-rec.rs b/src/test/run-fail/unwind-rec.rs index 016654500b4..7604f568fe7 100644 --- a/src/test/run-fail/unwind-rec.rs +++ b/src/test/run-fail/unwind-rec.rs @@ -10,11 +10,11 @@ // error-pattern:fail -fn build() -> ~[int] { +fn build() -> Vec { fail!(); } -struct Blk { node: ~[int] } +struct Blk { node: Vec } fn main() { let _blk = Blk { diff --git a/src/test/run-fail/unwind-rec2.rs b/src/test/run-fail/unwind-rec2.rs index 49a35181a8b..12990722d7b 100644 --- a/src/test/run-fail/unwind-rec2.rs +++ b/src/test/run-fail/unwind-rec2.rs @@ -10,15 +10,15 @@ // error-pattern:fail -fn build1() -> ~[int] { - ~[0,0,0,0,0,0,0] +fn build1() -> Vec { + vec!(0,0,0,0,0,0,0) } -fn build2() -> ~[int] { +fn build2() -> Vec { fail!(); } -struct Blk { node: ~[int], span: ~[int] } +struct Blk { node: Vec , span: Vec } fn main() { let _blk = Blk { diff --git a/src/test/run-fail/unwind-tup.rs b/src/test/run-fail/unwind-tup.rs index 2dd353f8e21..0d979233934 100644 --- a/src/test/run-fail/unwind-tup.rs +++ b/src/test/run-fail/unwind-tup.rs @@ -12,7 +12,7 @@ // error-pattern:fail -fn fold_local() -> @~[int]{ +fn fold_local() -> @Vec { fail!(); } diff --git a/src/test/run-fail/unwind-tup2.rs b/src/test/run-fail/unwind-tup2.rs index b86d7f11e85..1112e108d2d 100644 --- a/src/test/run-fail/unwind-tup2.rs +++ b/src/test/run-fail/unwind-tup2.rs @@ -12,11 +12,11 @@ // error-pattern:fail -fn fold_local() -> @~[int]{ - @~[0,0,0,0,0,0] +fn fold_local() -> @Vec { + @vec!(0,0,0,0,0,0) } -fn fold_remote() -> @~[int]{ +fn fold_remote() -> @Vec { fail!(); } diff --git a/src/test/run-fail/vec-overrun.rs b/src/test/run-fail/vec-overrun.rs index e7421fe241d..1542984c1d3 100644 --- a/src/test/run-fail/vec-overrun.rs +++ b/src/test/run-fail/vec-overrun.rs @@ -11,7 +11,7 @@ // error-pattern:index out of bounds: the len is 1 but the index is 2 fn main() { - let v: ~[int] = ~[10]; + let v: Vec = vec!(10); let x: int = 0; assert_eq!(v[x], 10); // Bounds-check failure. diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs index 1c797d8369f..1e26ce0c4f3 100644 --- a/src/test/run-pass-fulldeps/qquote.rs +++ b/src/test/run-pass-fulldeps/qquote.rs @@ -35,7 +35,7 @@ trait fake_ext_ctxt { type fake_session = parse::parse_sess; impl fake_ext_ctxt for fake_session { - fn cfg() -> ast::CrateConfig { ~[] } + fn cfg() -> ast::CrateConfig { Vec::new() } fn parse_sess() -> parse::parse_sess { self } fn call_site() -> span { codemap::span { diff --git a/src/test/run-pass-fulldeps/quote-tokens.rs b/src/test/run-pass-fulldeps/quote-tokens.rs index b11515ac24b..1bf601f71b4 100644 --- a/src/test/run-pass-fulldeps/quote-tokens.rs +++ b/src/test/run-pass-fulldeps/quote-tokens.rs @@ -18,8 +18,8 @@ use syntax::ext::base::ExtCtxt; fn syntax_extension(cx: &ExtCtxt) { - let e_toks : ~[syntax::ast::token_tree] = quote_tokens!(cx, 1 + 2); - let p_toks : ~[syntax::ast::token_tree] = quote_tokens!(cx, (x, 1 .. 4, *)); + let e_toks : Vec = quote_tokens!(cx, 1 + 2); + let p_toks : Vec = quote_tokens!(cx, (x, 1 .. 4, *)); let a: @syntax::ast::Expr = quote_expr!(cx, 1 + 2); let _b: Option<@syntax::ast::item> = quote_item!(cx, static foo : int = $e_toks; ); diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/run-pass/alloca-from-derived-tydesc.rs index ddaa38223ec..eba7e8c7ffb 100644 --- a/src/test/run-pass/alloca-from-derived-tydesc.rs +++ b/src/test/run-pass/alloca-from-derived-tydesc.rs @@ -10,8 +10,8 @@ enum option { some(T), none, } -struct R {v: ~[option]} +struct R {v: Vec> } -fn f() -> ~[T] { return ~[]; } +fn f() -> Vec { return Vec::new(); } -pub fn main() { let mut r: R = R {v: ~[]}; r.v = f(); } +pub fn main() { let mut r: R = R {v: Vec::new()}; r.v = f(); } diff --git a/src/test/run-pass/assignability-trait.rs b/src/test/run-pass/assignability-trait.rs index 85c5ae444eb..aa3e28c875e 100644 --- a/src/test/run-pass/assignability-trait.rs +++ b/src/test/run-pass/assignability-trait.rs @@ -22,7 +22,7 @@ fn iterate(&self, f: |x: &A| -> bool) -> bool { } } -impl iterable for ~[A] { +impl iterable for Vec { fn iterate(&self, f: |x: &A| -> bool) -> bool { self.iter().advance(f) } @@ -38,7 +38,7 @@ fn length>(x: T) -> uint { } pub fn main() { - let x = ~[0,1,2,3]; + let x = vec!(0,1,2,3); // Call a method x.iterate(|y| { assert!(x[*y] == *y); true }); // Call a parameterized function diff --git a/src/test/run-pass/auto-encode.rs b/src/test/run-pass/auto-encode.rs index 1ce6c1b77dd..e7ee6117992 100644 --- a/src/test/run-pass/auto-encode.rs +++ b/src/test/run-pass/auto-encode.rs @@ -119,7 +119,7 @@ struct Spanned { } #[deriving(Decodable, Encodable)] -struct SomeStruct { v: ~[uint] } +struct SomeStruct { v: Vec } #[deriving(Decodable, Encodable)] struct Point {x: uint, y: uint} diff --git a/src/test/run-pass/auto-loop.rs b/src/test/run-pass/auto-loop.rs index 33aee55b8c7..e5f4d078749 100644 --- a/src/test/run-pass/auto-loop.rs +++ b/src/test/run-pass/auto-loop.rs @@ -10,7 +10,7 @@ pub fn main() { let mut sum = 0; - let xs = ~[1, 2, 3, 4, 5]; + let xs = vec!(1, 2, 3, 4, 5); for x in xs.iter() { sum += *x; } diff --git a/src/test/run-pass/auto-ref-slice-plus-ref.rs b/src/test/run-pass/auto-ref-slice-plus-ref.rs index c22e25e5d95..0cc02d7a28b 100644 --- a/src/test/run-pass/auto-ref-slice-plus-ref.rs +++ b/src/test/run-pass/auto-ref-slice-plus-ref.rs @@ -29,7 +29,7 @@ pub fn main() { // NB: Associativity of ~, etc. in this context is surprising. These must be parenthesized ([1]).test_imm(); - (~[1]).test_imm(); + (vec!(1)).test_imm(); (&[1]).test_imm(); ("test").test_imm(); (~"test").test_imm(); diff --git a/src/test/run-pass/auto-ref-sliceable.rs b/src/test/run-pass/auto-ref-sliceable.rs index 8e2b3b56736..6b36746d230 100644 --- a/src/test/run-pass/auto-ref-sliceable.rs +++ b/src/test/run-pass/auto-ref-sliceable.rs @@ -12,15 +12,15 @@ trait Pushable { fn push_val(&mut self, t: T); } -impl Pushable for ~[T] { +impl Pushable for Vec { fn push_val(&mut self, t: T) { self.push(t); } } pub fn main() { - let mut v = ~[1]; + let mut v = vec!(1); v.push_val(2); v.push_val(3); - assert_eq!(v, ~[1, 2, 3]); + assert_eq!(v, vec!(1, 2, 3)); } diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs index c0ceb50a2c4..2fe5ce7a118 100644 --- a/src/test/run-pass/autobind.rs +++ b/src/test/run-pass/autobind.rs @@ -8,12 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn f(x: ~[T]) -> T { return x[0]; } +fn f(x: Vec ) -> T { return x[0]; } -fn g(act: |~[int]| -> int) -> int { return act(~[1, 2, 3]); } +fn g(act: |Vec | -> int) -> int { return act(vec!(1, 2, 3)); } pub fn main() { assert_eq!(g(f), 1); - let f1: |~[~str]| -> ~str = f; - assert_eq!(f1(~[~"x", ~"y", ~"z"]), ~"x"); + let f1: |Vec<~str> | -> ~str = f; + assert_eq!(f1(vec!(~"x", ~"y", ~"z")), ~"x"); } diff --git a/src/test/run-pass/block-arg.rs b/src/test/run-pass/block-arg.rs index 1957992e03d..8d0412ba30e 100644 --- a/src/test/run-pass/block-arg.rs +++ b/src/test/run-pass/block-arg.rs @@ -18,7 +18,7 @@ fn booly(fun: proc(bool) -> bool) -> bool { // Check usage and precedence of block arguments in expressions: pub fn main() { - let v = ~[-1.0f64, 0.0, 1.0, 2.0, 3.0]; + let v = vec!(-1.0f64, 0.0, 1.0, 2.0, 3.0); // Statement form does not require parentheses: for i in v.iter() { diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/run-pass/block-iter-1.rs index f14d42e17f3..ba6a94fa6ff 100644 --- a/src/test/run-pass/block-iter-1.rs +++ b/src/test/run-pass/block-iter-1.rs @@ -10,10 +10,10 @@ // ignore-fast -fn iter_vec(v: ~[T], f: |&T|) { for x in v.iter() { f(x); } } +fn iter_vec(v: Vec , f: |&T|) { for x in v.iter() { f(x); } } pub fn main() { - let v = ~[1, 2, 3, 4, 5, 6, 7]; + let v = vec!(1, 2, 3, 4, 5, 6, 7); let mut odds = 0; iter_vec(v, |i| { if *i % 2 == 1 { diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/run-pass/block-iter-2.rs index deabead4876..ba4bdbe636c 100644 --- a/src/test/run-pass/block-iter-2.rs +++ b/src/test/run-pass/block-iter-2.rs @@ -10,10 +10,10 @@ // ignore-fast -fn iter_vec(v: ~[T], f: |&T|) { for x in v.iter() { f(x); } } +fn iter_vec(v: Vec , f: |&T|) { for x in v.iter() { f(x); } } pub fn main() { - let v = ~[1, 2, 3, 4, 5]; + let v = vec!(1, 2, 3, 4, 5); let mut sum = 0; iter_vec(v.clone(), |i| { iter_vec(v.clone(), |j| { diff --git a/src/test/run-pass/borrow-by-val-method-receiver.rs b/src/test/run-pass/borrow-by-val-method-receiver.rs index 386f5f673d6..374c3e7fc53 100644 --- a/src/test/run-pass/borrow-by-val-method-receiver.rs +++ b/src/test/run-pass/borrow-by-val-method-receiver.rs @@ -17,6 +17,6 @@ fn foo(self) {} } pub fn main() { - let items = ~[ 3, 5, 1, 2, 4 ]; + let items = vec!( 3, 5, 1, 2, 4 ); items.foo(); } diff --git a/src/test/run-pass/borrowck-binding-mutbl.rs b/src/test/run-pass/borrowck-binding-mutbl.rs index 377ed2608e5..126f0fd7ac5 100644 --- a/src/test/run-pass/borrowck-binding-mutbl.rs +++ b/src/test/run-pass/borrowck-binding-mutbl.rs @@ -8,13 +8,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -struct F { f: ~[int] } +struct F { f: Vec } fn impure(_v: &[int]) { } pub fn main() { - let mut x = F {f: ~[3]}; + let mut x = F {f: vec!(3)}; match x { F {f: ref mut v} => { diff --git a/src/test/run-pass/borrowck-mut-uniq.rs b/src/test/run-pass/borrowck-mut-uniq.rs index d90087ebdea..ac6ea8dec05 100644 --- a/src/test/run-pass/borrowck-mut-uniq.rs +++ b/src/test/run-pass/borrowck-mut-uniq.rs @@ -10,11 +10,11 @@ use std::mem::swap; -struct Ints {sum: ~int, values: ~[int]} +struct Ints {sum: ~int, values: Vec } fn add_int(x: &mut Ints, v: int) { *x.sum += v; - let mut values = ~[]; + let mut values = Vec::new(); swap(&mut values, &mut x.values); values.push(v); swap(&mut values, &mut x.values); @@ -26,7 +26,7 @@ fn iter_ints(x: &Ints, f: |x: &int| -> bool) -> bool { } pub fn main() { - let mut ints = ~Ints {sum: ~0, values: ~[]}; + let mut ints = ~Ints {sum: ~0, values: Vec::new()}; add_int(ints, 22); add_int(ints, 44); diff --git a/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs b/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs index 1ca94d6a221..e6fcb1ca951 100644 --- a/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs +++ b/src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs @@ -14,10 +14,10 @@ fn want_slice(v: &[int]) -> int { sum } -fn has_mut_vec(v: ~[int]) -> int { +fn has_mut_vec(v: Vec ) -> int { want_slice(v) } pub fn main() { - assert_eq!(has_mut_vec(~[1, 2, 3]), 6); + assert_eq!(has_mut_vec(vec!(1, 2, 3)), 6); } diff --git a/src/test/run-pass/borrowck-root-while-cond-2.rs b/src/test/run-pass/borrowck-root-while-cond-2.rs index 9511d1b40e6..3b07ffa26da 100644 --- a/src/test/run-pass/borrowck-root-while-cond-2.rs +++ b/src/test/run-pass/borrowck-root-while-cond-2.rs @@ -11,9 +11,9 @@ #[feature(managed_boxes)]; struct F { f: @G } -struct G { g: ~[int] } +struct G { g: Vec } pub fn main() { - let rec = @F {f: @G {g: ~[1, 2, 3]}}; + let rec = @F {f: @G {g: vec!(1, 2, 3)}}; while rec.f.g.len() == 23 {} } diff --git a/src/test/run-pass/break.rs b/src/test/run-pass/break.rs index 1ae77bc1eca..bcfb8f6f914 100644 --- a/src/test/run-pass/break.rs +++ b/src/test/run-pass/break.rs @@ -25,7 +25,7 @@ pub fn main() { i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0)); if i >= 10 { break; } } - let ys = ~[1, 2, 3, 4, 5, 6]; + let ys = vec!(1, 2, 3, 4, 5, 6); for x in ys.iter() { if *x % 2 == 0 { continue; } assert!((*x % 2 != 0)); diff --git a/src/test/run-pass/call-closure-from-overloaded-op.rs b/src/test/run-pass/call-closure-from-overloaded-op.rs index 16728dffd19..d27dd8f92d1 100644 --- a/src/test/run-pass/call-closure-from-overloaded-op.rs +++ b/src/test/run-pass/call-closure-from-overloaded-op.rs @@ -11,7 +11,7 @@ fn foo() -> int { 22 } pub fn main() { - let mut x: ~[extern "Rust" fn() -> int] = ~[]; + let mut x: vec!(extern "Rust" fn() -> int) = Vec::new(); x.push(foo); assert_eq!((x[0])(), 22); } diff --git a/src/test/run-pass/cci_no_inline_exe.rs b/src/test/run-pass/cci_no_inline_exe.rs index bd18acedbff..64da1feb34c 100644 --- a/src/test/run-pass/cci_no_inline_exe.rs +++ b/src/test/run-pass/cci_no_inline_exe.rs @@ -22,7 +22,7 @@ pub fn main() { // actually working. //let bt0 = sys::frame_address(); //println!("%?", bt0); - iter(~[1u, 2u, 3u], |i| { + iter(vec!(1u, 2u, 3u), |i| { println!("{}", i); //let bt1 = sys::frame_address(); diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/run-pass/class-poly-methods-cross-crate.rs index 671d7a40353..f8177bb0ada 100644 --- a/src/test/run-pass/class-poly-methods-cross-crate.rs +++ b/src/test/run-pass/class-poly-methods-cross-crate.rs @@ -14,12 +14,12 @@ use cci_class_6::kitties::cat; pub fn main() { - let mut nyan : cat = cat::(52u, 99, ~['p']); - let mut kitty = cat(1000u, 2, ~[~"tabby"]); + let mut nyan : cat = cat::(52u, 99, vec!('p')); + let mut kitty = cat(1000u, 2, vec!(~"tabby")); assert_eq!(nyan.how_hungry, 99); assert_eq!(kitty.how_hungry, 2); - nyan.speak(~[1u,2u,3u]); + nyan.speak(vec!(1u,2u,3u)); assert_eq!(nyan.meow_count(), 55u); - kitty.speak(~[~"meow", ~"mew", ~"purr", ~"chirp"]); + kitty.speak(vec!(~"meow", ~"mew", ~"purr", ~"chirp")); assert_eq!(kitty.meow_count(), 1004u); } diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/run-pass/class-poly-methods.rs index f4d3a115ef1..cddb5bb7e15 100644 --- a/src/test/run-pass/class-poly-methods.rs +++ b/src/test/run-pass/class-poly-methods.rs @@ -9,20 +9,20 @@ // except according to those terms. struct cat { - info : ~[U], + info : Vec , meows : uint, how_hungry : int, } impl cat { - pub fn speak(&mut self, stuff: ~[T]) { + pub fn speak(&mut self, stuff: Vec ) { self.meows += stuff.len(); } pub fn meow_count(&mut self) -> uint { self.meows } } -fn cat(in_x : uint, in_y : int, in_info: ~[U]) -> cat { +fn cat(in_x : uint, in_y : int, in_info: Vec ) -> cat { cat { meows: in_x, how_hungry: in_y, @@ -31,12 +31,12 @@ fn cat(in_x : uint, in_y : int, in_info: ~[U]) -> cat { } pub fn main() { - let mut nyan : cat = cat::(52u, 99, ~[9]); - let mut kitty = cat(1000u, 2, ~[~"tabby"]); + let mut nyan : cat = cat::(52u, 99, vec!(9)); + let mut kitty = cat(1000u, 2, vec!(~"tabby")); assert_eq!(nyan.how_hungry, 99); assert_eq!(kitty.how_hungry, 2); - nyan.speak(~[1,2,3]); + nyan.speak(vec!(1,2,3)); assert_eq!(nyan.meow_count(), 55u); - kitty.speak(~[~"meow", ~"mew", ~"purr", ~"chirp"]); + kitty.speak(vec!(~"meow", ~"mew", ~"purr", ~"chirp")); assert_eq!(kitty.meow_count(), 1004u); } diff --git a/src/test/run-pass/cleanup-rvalue-scopes.rs b/src/test/run-pass/cleanup-rvalue-scopes.rs index 7ed59ec74b4..6d1c3aab662 100644 --- a/src/test/run-pass/cleanup-rvalue-scopes.rs +++ b/src/test/run-pass/cleanup-rvalue-scopes.rs @@ -116,7 +116,7 @@ pub fn main() { end_of_block!(_, { { check_flags(0); &AddFlags(1) } }); end_of_block!(_, &((Box { f: AddFlags(1) }).f)); end_of_block!(_, &(([AddFlags(1)])[0])); - end_of_block!(_, &((&~[AddFlags(1)])[0])); + end_of_block!(_, &((&vec!(AddFlags(1)))[0])); // LHS does not create a ref binding, so temporary lives as long // as statement, and we do not move the AddFlags out: diff --git a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs index ec422a54b3a..b9587c57787 100644 --- a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs +++ b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs @@ -36,11 +36,11 @@ fn do_it(x: &[uint]) -> Foo { fail!() } -fn get_bar(x: uint) -> ~[uint] { ~[x * 2] } +fn get_bar(x: uint) -> Vec { vec!(x * 2) } pub fn fails() { let x = 2; - let mut y = ~[]; + let mut y = Vec::new(); y.push(~Bickwick(do_it(get_bar(x)))); } diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs index dee2b6f2568..ffac7cbdab0 100644 --- a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs +++ b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs @@ -8,16 +8,16 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn bar(v: &mut [uint]) -> ~[uint] { +fn bar(v: &mut [uint]) -> Vec { v.to_owned() } -fn bip(v: &[uint]) -> ~[uint] { +fn bip(v: &[uint]) -> Vec { v.to_owned() } pub fn main() { - let mut the_vec = ~[1u, 2, 3, 100]; + let mut the_vec = vec!(1u, 2, 3, 100); assert_eq!(the_vec.clone(), bar(the_vec)); assert_eq!(the_vec.clone(), bip(the_vec)); } diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs b/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs index 0e205617173..67d81ab8684 100644 --- a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs +++ b/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs @@ -19,7 +19,7 @@ fn bar(v: &mut [uint]) { } pub fn main() { - let mut the_vec = ~[1, 2, 3, 100]; + let mut the_vec = vec!(1, 2, 3, 100); bar(the_vec); - assert_eq!(the_vec, ~[100, 3, 2, 1]); + assert_eq!(the_vec, vec!(100, 3, 2, 1)); } diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs b/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs index 3deb31efd31..31620973ce7 100644 --- a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs +++ b/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs @@ -15,7 +15,7 @@ fn bar(v: &mut [uint]) { } pub fn main() { - let mut the_vec = ~[1, 2, 3, 100]; + let mut the_vec = vec!(1, 2, 3, 100); bar(the_vec); - assert_eq!(the_vec, ~[100, 3, 2, 1]); + assert_eq!(the_vec, vec!(100, 3, 2, 1)); } diff --git a/src/test/run-pass/const-enum-vec-repeat.rs b/src/test/run-pass/const-enum-vec-repeat.rs index 44b91fcee3c..5470b1d6615 100644 --- a/src/test/run-pass/const-enum-vec-repeat.rs +++ b/src/test/run-pass/const-enum-vec-repeat.rs @@ -11,5 +11,5 @@ enum State { ST_NULL, ST_WHITESPACE = 1 } pub fn main() { - ~[ST_NULL, ..(ST_WHITESPACE as uint)]; + vec!(ST_NULL, ..(ST_WHITESPACE as uint)); } diff --git a/src/test/run-pass/empty-mutable-vec.rs b/src/test/run-pass/empty-mutable-vec.rs index 6c90e011218..f3d9eba87b6 100644 --- a/src/test/run-pass/empty-mutable-vec.rs +++ b/src/test/run-pass/empty-mutable-vec.rs @@ -10,4 +10,4 @@ #[allow(unused_mut)]; -pub fn main() { let mut _v: ~[int] = ~[]; } +pub fn main() { let mut _v: Vec = Vec::new(); } diff --git a/src/test/run-pass/expr-fn.rs b/src/test/run-pass/expr-fn.rs index cba1bab3004..25dae36bcb1 100644 --- a/src/test/run-pass/expr-fn.rs +++ b/src/test/run-pass/expr-fn.rs @@ -14,7 +14,7 @@ fn f() -> int { 10 } } fn test_vec() { - fn f() -> ~[int] { ~[10, 11] } + fn f() -> Vec { vec!(10, 11) } assert_eq!(f()[1], 11); } diff --git a/src/test/run-pass/expr-match-fail.rs b/src/test/run-pass/expr-match-fail.rs index 3e1b96763e1..71306a43f23 100644 --- a/src/test/run-pass/expr-match-fail.rs +++ b/src/test/run-pass/expr-match-fail.rs @@ -14,7 +14,7 @@ fn test_simple() { } fn test_box() { - let r = match true { true => { ~[10] } false => { fail!() } }; + let r = match true { true => { vec!(10) } false => { fail!() } }; assert_eq!(r[0], 10); } diff --git a/src/test/run-pass/expr-repeat-vstore.rs b/src/test/run-pass/expr-repeat-vstore.rs index c34c902b814..a111a878ddd 100644 --- a/src/test/run-pass/expr-repeat-vstore.rs +++ b/src/test/run-pass/expr-repeat-vstore.rs @@ -11,7 +11,7 @@ #[feature(managed_boxes)]; pub fn main() { - let v: ~[int] = ~[ 1, ..5 ]; + let v: Vec = vec!( 1, ..5 ); println!("{}", v[0]); println!("{}", v[1]); println!("{}", v[2]); diff --git a/src/test/run-pass/for-destruct.rs b/src/test/run-pass/for-destruct.rs index fae67e9e3d9..7cc8b22e061 100644 --- a/src/test/run-pass/for-destruct.rs +++ b/src/test/run-pass/for-destruct.rs @@ -11,7 +11,7 @@ struct Pair { x: int, y: int } pub fn main() { - for elt in (~[Pair {x: 10, y: 20}, Pair {x: 30, y: 0}]).iter() { + for elt in (vec!(Pair {x: 10, y: 20}, Pair {x: 30, y: 0})).iter() { assert_eq!(elt.x + elt.y, 30); } } diff --git a/src/test/run-pass/for-loop-fail.rs b/src/test/run-pass/for-loop-fail.rs index ff718500340..d93f90937a1 100644 --- a/src/test/run-pass/for-loop-fail.rs +++ b/src/test/run-pass/for-loop-fail.rs @@ -8,4 +8,4 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub fn main() { let x: ~[int] = ~[]; for _ in x.iter() { fail!("moop"); } } +pub fn main() { let x: Vec = Vec::new(); for _ in x.iter() { fail!("moop"); } } diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/run-pass/foreach-nested.rs index 9646c6b6eb7..26395ed51f6 100644 --- a/src/test/run-pass/foreach-nested.rs +++ b/src/test/run-pass/foreach-nested.rs @@ -14,7 +14,7 @@ fn two(it: |int|) { it(0); it(1); } pub fn main() { - let mut a: ~[int] = ~[-1, -1, -1, -1]; + let mut a: Vec = vec!(-1, -1, -1, -1); let mut p: int = 0; two(|i| { two(|j| { a[p] = 10 * i + j; p += 1; }) diff --git a/src/test/run-pass/generic-ivec-leak.rs b/src/test/run-pass/generic-ivec-leak.rs index 17de964dd86..f879e195292 100644 --- a/src/test/run-pass/generic-ivec-leak.rs +++ b/src/test/run-pass/generic-ivec-leak.rs @@ -10,4 +10,4 @@ enum wrapper { wrapped(T), } -pub fn main() { let _w = wrapped(~[1, 2, 3, 4, 5]); } +pub fn main() { let _w = wrapped(vec!(1, 2, 3, 4, 5)); } diff --git a/src/test/run-pass/generic-ivec.rs b/src/test/run-pass/generic-ivec.rs index e4f545afda6..c2eae064019 100644 --- a/src/test/run-pass/generic-ivec.rs +++ b/src/test/run-pass/generic-ivec.rs @@ -11,4 +11,4 @@ #[feature(managed_boxes)]; fn f(_v: @T) { } -pub fn main() { f(@~[1, 2, 3, 4, 5]); } +pub fn main() { f(@vec!(1, 2, 3, 4, 5)); } diff --git a/src/test/run-pass/generic-static-methods.rs b/src/test/run-pass/generic-static-methods.rs index 5832c565d7f..ccc1936fa99 100644 --- a/src/test/run-pass/generic-static-methods.rs +++ b/src/test/run-pass/generic-static-methods.rs @@ -9,12 +9,12 @@ // except according to those terms. trait vec_utils { - fn map_(x: &Self, f: |&T| -> U) -> ~[U]; + fn map_(x: &Self, f: |&T| -> U) -> Vec ; } -impl vec_utils for ~[T] { - fn map_(x: &~[T], f: |&T| -> U) -> ~[U] { - let mut r = ~[]; +impl vec_utils for Vec { + fn map_(x: &Vec , f: |&T| -> U) -> Vec { + let mut r = Vec::new(); for elt in x.iter() { r.push(f(elt)); } @@ -23,5 +23,5 @@ fn map_(x: &~[T], f: |&T| -> U) -> ~[U] { } pub fn main() { - assert_eq!(vec_utils::map_(&~[1,2,3], |&x| x+1), ~[2,3,4]); + assert_eq!(vec_utils::map_(&vec!(1,2,3), |&x| x+1), vec!(2,3,4)); } diff --git a/src/test/run-pass/getopts_ref.rs b/src/test/run-pass/getopts_ref.rs index 55ecf919b72..5dea08ce646 100644 --- a/src/test/run-pass/getopts_ref.rs +++ b/src/test/run-pass/getopts_ref.rs @@ -15,8 +15,8 @@ use getopts::{optopt, getopts}; pub fn main() { - let args = ~[]; - let opts = ~[optopt("b", "", "something", "SMTHNG")]; + let args = Vec::new(); + let opts = vec!(optopt("b", "", "something", "SMTHNG")); match getopts(args, opts) { Ok(ref m) => diff --git a/src/test/run-pass/glob-std.rs b/src/test/run-pass/glob-std.rs index 03c83bb24c8..0a12731fb46 100644 --- a/src/test/run-pass/glob-std.rs +++ b/src/test/run-pass/glob-std.rs @@ -40,7 +40,7 @@ fn abs_path(path: &str) -> Path { os::getcwd().join(&Path::new(path)) } - fn glob_vec(pattern: &str) -> ~[Path] { + fn glob_vec(pattern: &str) -> Vec { glob(pattern).collect() } @@ -72,133 +72,133 @@ fn glob_vec(pattern: &str) -> ~[Path] { mk_file("xyz/y", false); mk_file("xyz/z", false); - assert_eq!(glob_vec(""), ~[]); - assert_eq!(glob_vec("."), ~[]); - assert_eq!(glob_vec(".."), ~[]); + assert_eq!(glob_vec(""), Vec::new()); + assert_eq!(glob_vec("."), Vec::new()); + assert_eq!(glob_vec(".."), Vec::new()); - assert_eq!(glob_vec("aaa"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("aaa/"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("a"), ~[]); - assert_eq!(glob_vec("aa"), ~[]); - assert_eq!(glob_vec("aaaa"), ~[]); + assert_eq!(glob_vec("aaa"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("aaa/"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("a"), Vec::new()); + assert_eq!(glob_vec("aa"), Vec::new()); + assert_eq!(glob_vec("aaaa"), Vec::new()); - assert_eq!(glob_vec("aaa/apple"), ~[abs_path("aaa/apple")]); - assert_eq!(glob_vec("aaa/apple/nope"), ~[]); + assert_eq!(glob_vec("aaa/apple"), vec!(abs_path("aaa/apple"))); + assert_eq!(glob_vec("aaa/apple/nope"), Vec::new()); // windows should support both / and \ as directory separators if os::consts::FAMILY == os::consts::windows::FAMILY { - assert_eq!(glob_vec("aaa\\apple"), ~[abs_path("aaa/apple")]); + assert_eq!(glob_vec("aaa\\apple"), vec!(abs_path("aaa/apple"))); } - assert_eq!(glob_vec("???/"), ~[ + assert_eq!(glob_vec("???/"), vec!( abs_path("aaa"), abs_path("bbb"), abs_path("ccc"), - abs_path("xyz")]); + abs_path("xyz"))); - assert_eq!(glob_vec("aaa/tomato/tom?to.txt"), ~[ + assert_eq!(glob_vec("aaa/tomato/tom?to.txt"), vec!( abs_path("aaa/tomato/tomato.txt"), - abs_path("aaa/tomato/tomoto.txt")]); + abs_path("aaa/tomato/tomoto.txt"))); - assert_eq!(glob_vec("xyz/?"), ~[ + assert_eq!(glob_vec("xyz/?"), vec!( abs_path("xyz/x"), abs_path("xyz/y"), - abs_path("xyz/z")]); - - assert_eq!(glob_vec("a*"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("*a*"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("a*a"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("aaa*"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("*aaa"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("*aaa*"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("*a*a*a*"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("aaa*/"), ~[abs_path("aaa")]); - - assert_eq!(glob_vec("aaa/*"), ~[ + abs_path("xyz/z"))); + + assert_eq!(glob_vec("a*"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("*a*"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("a*a"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("aaa*"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("*aaa"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("*aaa*"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("*a*a*a*"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("aaa*/"), vec!(abs_path("aaa"))); + + assert_eq!(glob_vec("aaa/*"), vec!( abs_path("aaa/apple"), abs_path("aaa/orange"), - abs_path("aaa/tomato")]); + abs_path("aaa/tomato"))); - assert_eq!(glob_vec("aaa/*a*"), ~[ + assert_eq!(glob_vec("aaa/*a*"), vec!( abs_path("aaa/apple"), abs_path("aaa/orange"), - abs_path("aaa/tomato")]); + abs_path("aaa/tomato"))); - assert_eq!(glob_vec("*/*/*.txt"), ~[ + assert_eq!(glob_vec("*/*/*.txt"), vec!( abs_path("aaa/tomato/tomato.txt"), - abs_path("aaa/tomato/tomoto.txt")]); + abs_path("aaa/tomato/tomoto.txt"))); - assert_eq!(glob_vec("*/*/t[aob]m?to[.]t[!y]t"), ~[ + assert_eq!(glob_vec("*/*/t[aob]m?to[.]t[!y]t"), vec!( abs_path("aaa/tomato/tomato.txt"), - abs_path("aaa/tomato/tomoto.txt")]); + abs_path("aaa/tomato/tomoto.txt"))); - assert_eq!(glob_vec("aa[a]"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("aa[abc]"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("a[bca]a"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("aa[b]"), ~[]); - assert_eq!(glob_vec("aa[xyz]"), ~[]); - assert_eq!(glob_vec("aa[]]"), ~[]); + assert_eq!(glob_vec("aa[a]"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("aa[abc]"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("a[bca]a"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("aa[b]"), Vec::new()); + assert_eq!(glob_vec("aa[xyz]"), Vec::new()); + assert_eq!(glob_vec("aa[]]"), Vec::new()); - assert_eq!(glob_vec("aa[!b]"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("aa[!bcd]"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("a[!bcd]a"), ~[abs_path("aaa")]); - assert_eq!(glob_vec("aa[!a]"), ~[]); - assert_eq!(glob_vec("aa[!abc]"), ~[]); + assert_eq!(glob_vec("aa[!b]"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("aa[!bcd]"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("a[!bcd]a"), vec!(abs_path("aaa"))); + assert_eq!(glob_vec("aa[!a]"), Vec::new()); + assert_eq!(glob_vec("aa[!abc]"), Vec::new()); - assert_eq!(glob_vec("bbb/specials/[[]"), ~[abs_path("bbb/specials/[")]); - assert_eq!(glob_vec("bbb/specials/!"), ~[abs_path("bbb/specials/!")]); - assert_eq!(glob_vec("bbb/specials/[]]"), ~[abs_path("bbb/specials/]")]); + assert_eq!(glob_vec("bbb/specials/[[]"), vec!(abs_path("bbb/specials/["))); + assert_eq!(glob_vec("bbb/specials/!"), vec!(abs_path("bbb/specials/!"))); + assert_eq!(glob_vec("bbb/specials/[]]"), vec!(abs_path("bbb/specials/]"))); if os::consts::FAMILY != os::consts::windows::FAMILY { - assert_eq!(glob_vec("bbb/specials/[*]"), ~[abs_path("bbb/specials/*")]); - assert_eq!(glob_vec("bbb/specials/[?]"), ~[abs_path("bbb/specials/?")]); + assert_eq!(glob_vec("bbb/specials/[*]"), vec!(abs_path("bbb/specials/*"))); + assert_eq!(glob_vec("bbb/specials/[?]"), vec!(abs_path("bbb/specials/?"))); } if os::consts::FAMILY == os::consts::windows::FAMILY { - assert_eq!(glob_vec("bbb/specials/[![]"), ~[ + assert_eq!(glob_vec("bbb/specials/[![]"), vec!( abs_path("bbb/specials/!"), - abs_path("bbb/specials/]")]); + abs_path("bbb/specials/]"))); - assert_eq!(glob_vec("bbb/specials/[!]]"), ~[ + assert_eq!(glob_vec("bbb/specials/[!]]"), vec!( abs_path("bbb/specials/!"), - abs_path("bbb/specials/[")]); + abs_path("bbb/specials/["))); - assert_eq!(glob_vec("bbb/specials/[!!]"), ~[ + assert_eq!(glob_vec("bbb/specials/[!!]"), vec!( abs_path("bbb/specials/["), - abs_path("bbb/specials/]")]); + abs_path("bbb/specials/]"))); } else { - assert_eq!(glob_vec("bbb/specials/[![]"), ~[ + assert_eq!(glob_vec("bbb/specials/[![]"), vec!( abs_path("bbb/specials/!"), abs_path("bbb/specials/*"), abs_path("bbb/specials/?"), - abs_path("bbb/specials/]")]); + abs_path("bbb/specials/]"))); - assert_eq!(glob_vec("bbb/specials/[!]]"), ~[ + assert_eq!(glob_vec("bbb/specials/[!]]"), vec!( abs_path("bbb/specials/!"), abs_path("bbb/specials/*"), abs_path("bbb/specials/?"), - abs_path("bbb/specials/[")]); + abs_path("bbb/specials/["))); - assert_eq!(glob_vec("bbb/specials/[!!]"), ~[ + assert_eq!(glob_vec("bbb/specials/[!!]"), vec!( abs_path("bbb/specials/*"), abs_path("bbb/specials/?"), abs_path("bbb/specials/["), - abs_path("bbb/specials/]")]); + abs_path("bbb/specials/]"))); - assert_eq!(glob_vec("bbb/specials/[!*]"), ~[ + assert_eq!(glob_vec("bbb/specials/[!*]"), vec!( abs_path("bbb/specials/!"), abs_path("bbb/specials/?"), abs_path("bbb/specials/["), - abs_path("bbb/specials/]")]); + abs_path("bbb/specials/]"))); - assert_eq!(glob_vec("bbb/specials/[!?]"), ~[ + assert_eq!(glob_vec("bbb/specials/[!?]"), vec!( abs_path("bbb/specials/!"), abs_path("bbb/specials/*"), abs_path("bbb/specials/["), - abs_path("bbb/specials/]")]); + abs_path("bbb/specials/]"))); } } diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs index 20d33a09f79..a11e286b969 100644 --- a/src/test/run-pass/hashmap-memory.rs +++ b/src/test/run-pass/hashmap-memory.rs @@ -31,9 +31,9 @@ mod map_reduce { pub type mapper = extern fn(~str, putter); - enum ctrl_proto { find_reducer(~[u8], Sender), mapper_done, } + enum ctrl_proto { find_reducer(Vec, Sender), mapper_done, } - fn start_mappers(ctrl: Sender, inputs: ~[~str]) { + fn start_mappers(ctrl: Sender, inputs: Vec<~str>) { for i in inputs.iter() { let ctrl = ctrl.clone(); let i = i.clone(); @@ -64,7 +64,7 @@ fn emit(im: &mut HashMap<~str, int>, ctrl_clone.send(mapper_done); } - pub fn map_reduce(inputs: ~[~str]) { + pub fn map_reduce(inputs: Vec<~str>) { let (tx, rx) = channel(); // This task becomes the master control task. It spawns others @@ -95,5 +95,5 @@ pub fn map_reduce(inputs: ~[~str]) { } pub fn main() { - map_reduce::map_reduce(~[~"../src/test/run-pass/hashmap-memory.rs"]); + map_reduce::map_reduce(vec!(~"../src/test/run-pass/hashmap-memory.rs")); } diff --git a/src/test/run-pass/html-literals.rs b/src/test/run-pass/html-literals.rs index 97040716a11..5141be1f178 100644 --- a/src/test/run-pass/html-literals.rs +++ b/src/test/run-pass/html-literals.rs @@ -41,7 +41,7 @@ macro_rules! parse_node ( parse_node!( [$(: $tags ($(:$tag_nodes),*))*]; [$(:$head_nodes,)* :tag(stringify!($head).to_owned(), - ~[$($nodes),*])]; + vec!($($nodes),*))]; $($rest)* ) ); @@ -97,6 +97,6 @@ pub fn main() { } enum HTMLFragment { - tag(~str, ~[HTMLFragment]), + tag(~str, Vec ), text(~str), } diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs index dc66c888402..e3ea5886fa3 100644 --- a/src/test/run-pass/import-glob-crate.rs +++ b/src/test/run-pass/import-glob-crate.rs @@ -18,5 +18,5 @@ pub fn main() { let mut v = from_elem(0u, 0); v = append(v, [4, 2]); - assert_eq!(from_fn(2, |i| 2*(i+1)), ~[2, 4]); + assert_eq!(from_fn(2, |i| 2*(i+1)), vec!(2, 4)); } diff --git a/src/test/run-pass/infer-fn-tail-expr.rs b/src/test/run-pass/infer-fn-tail-expr.rs index eb8601361cd..6642d1a5a8e 100644 --- a/src/test/run-pass/infer-fn-tail-expr.rs +++ b/src/test/run-pass/infer-fn-tail-expr.rs @@ -10,6 +10,6 @@ // issue #680 -fn f() -> ~[int] { ~[] } +fn f() -> Vec { Vec::new() } pub fn main() { } diff --git a/src/test/run-pass/integral-indexing.rs b/src/test/run-pass/integral-indexing.rs index 18ff6fe1896..cbbe101c58a 100644 --- a/src/test/run-pass/integral-indexing.rs +++ b/src/test/run-pass/integral-indexing.rs @@ -13,7 +13,7 @@ // This is a testcase for issue #94. pub fn main() { - let v: ~[int] = ~[0, 1, 2, 3, 4, 5]; + let v: Vec = vec!(0, 1, 2, 3, 4, 5); let s: ~str = ~"abcdef"; assert_eq!(v[3u], 3); assert_eq!(v[3u8], 3); diff --git a/src/test/run-pass/issue-1821.rs b/src/test/run-pass/issue-1821.rs index 92f0beaeb9c..ccd2399a06d 100644 --- a/src/test/run-pass/issue-1821.rs +++ b/src/test/run-pass/issue-1821.rs @@ -10,6 +10,6 @@ // Issue #1821 - Don't recurse trying to typecheck this enum t { - foo(~[t]) + foo(vec!(t)) } pub fn main() {} diff --git a/src/test/run-pass/issue-2502.rs b/src/test/run-pass/issue-2502.rs index 2ee5b2e60de..cfdd226ef5c 100644 --- a/src/test/run-pass/issue-2502.rs +++ b/src/test/run-pass/issue-2502.rs @@ -9,16 +9,16 @@ // except according to those terms. struct font<'a> { - fontbuf: &'a ~[u8], + fontbuf: &'a Vec , } impl<'a> font<'a> { - pub fn buf(&self) -> &'a ~[u8] { + pub fn buf(&self) -> &'a Vec { self.fontbuf } } -fn font<'r>(fontbuf: &'r ~[u8]) -> font<'r> { +fn font<'r>(fontbuf: &'r Vec ) -> font<'r> { font { fontbuf: fontbuf } diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs index 592232ca21d..1ea268eafca 100644 --- a/src/test/run-pass/issue-2631-b.rs +++ b/src/test/run-pass/issue-2631-b.rs @@ -21,7 +21,7 @@ use collections::HashMap; pub fn main() { - let v = ~[@~"hi"]; + let v = vec!(@~"hi"); let mut m: req::header_map = HashMap::new(); m.insert(~"METHOD", @RefCell::new(v)); request::(&m); diff --git a/src/test/run-pass/issue-2723-b.rs b/src/test/run-pass/issue-2723-b.rs index ef20c481eb9..4bf5a562cf0 100644 --- a/src/test/run-pass/issue-2723-b.rs +++ b/src/test/run-pass/issue-2723-b.rs @@ -16,6 +16,6 @@ pub fn main() { unsafe { - f(~[2]); + f(vec!(2)); } } diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass/issue-2804.rs index ca48f3ffd50..eeda79e1355 100644 --- a/src/test/run-pass/issue-2804.rs +++ b/src/test/run-pass/issue-2804.rs @@ -55,8 +55,7 @@ fn add_interface(_store: int, managed_ip: ~str, data: json::Json) -> (~str, obje } fn add_interfaces(store: int, managed_ip: ~str, device: HashMap<~str, json::Json>) --> ~[(~str, object)] -{ +-> Vec<(~str, object)> { match device.get(&~"interfaces") { &json::List(ref interfaces) => @@ -69,7 +68,7 @@ fn add_interfaces(store: int, managed_ip: ~str, device: HashMap<~str, json::Json { println!("Expected list for {} interfaces but found {:?}", managed_ip, device.get(&~"interfaces")); - ~[] + Vec::new() } } } diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs index 0fa93f37840..9ffe4bc4d7e 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/run-pass/issue-2904.rs @@ -60,12 +60,12 @@ fn square_from_char(c: char) -> square { } } -fn read_board_grid(mut input: rdr) -> ~[~[square]] { +fn read_board_grid(mut input: rdr) -> vec!(vec!(square)) { let mut input: &mut io::Reader = &mut input; - let mut grid = ~[]; + let mut grid = Vec::new(); let mut line = [0, ..10]; input.read(line); - let mut row = ~[]; + let mut row = Vec::new(); for c in line.iter() { row.push(square_from_char(*c as char)) } diff --git a/src/test/run-pass/issue-2989.rs b/src/test/run-pass/issue-2989.rs index bfb9f54b967..d625f6bcf92 100644 --- a/src/test/run-pass/issue-2989.rs +++ b/src/test/run-pass/issue-2989.rs @@ -8,22 +8,20 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::slice; - trait methods { - fn to_bytes(&self) -> ~[u8]; + fn to_bytes(&self) -> Vec ; } impl methods for () { - fn to_bytes(&self) -> ~[u8] { - slice::from_elem(0, 0u8) + fn to_bytes(&self) -> Vec { + Vec::from_elem(0, 0u8) } } // the position of this function is significant! - if it comes before methods // then it works, if it comes after it then it doesn't! -fn to_bools(bitv: Storage) -> ~[bool] { - slice::from_fn(8, |i| { +fn to_bools(bitv: Storage) -> Vec { + Vec::from_fn(8, |i| { let w = i / 64; let b = i % 64; let x = 1u64 & (bitv.storage[w] >> b); @@ -31,11 +29,11 @@ fn to_bools(bitv: Storage) -> ~[bool] { }) } -struct Storage { storage: ~[u64] } +struct Storage { storage: Vec } pub fn main() { - let bools = ~[false, false, true, false, false, true, true, false]; - let bools2 = to_bools(Storage{storage: ~[0b01100100]}); + let bools = vec!(false, false, true, false, false, true, true, false); + let bools2 = to_bools(Storage{storage: vec!(0b01100100)}); for i in range(0u, 8) { println!("{} => {} vs {}", i, bools[i], bools2[i]); diff --git a/src/test/run-pass/issue-3052.rs b/src/test/run-pass/issue-3052.rs index 8179d85e601..bc33bb72aa8 100644 --- a/src/test/run-pass/issue-3052.rs +++ b/src/test/run-pass/issue-3052.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -type Connection = 'static |~[u8]|; +type Connection = 'static |Vec |; fn f() -> Option { let mock_connection: Connection = |_| {}; diff --git a/src/test/run-pass/issue-3389.rs b/src/test/run-pass/issue-3389.rs index 45c0ea4d543..96ecc81edcc 100644 --- a/src/test/run-pass/issue-3389.rs +++ b/src/test/run-pass/issue-3389.rs @@ -9,11 +9,11 @@ // except according to those terms. struct trie_node { - content: ~[~str], - children: ~[trie_node], + content: Vec<~str> , + children: Vec , } -fn print_str_vector(vector: ~[~str]) { +fn print_str_vector(vector: Vec<~str> ) { for string in vector.iter() { println!("{}", *string); } @@ -21,11 +21,11 @@ fn print_str_vector(vector: ~[~str]) { pub fn main() { let mut node: trie_node = trie_node { - content: ~[], - children: ~[] + content: Vec::new(), + children: Vec::new() }; - let v = ~[~"123", ~"abc"]; - node.content = ~[~"123", ~"abc"]; + let v = vec!(~"123", ~"abc"); + node.content = vec!(~"123", ~"abc"); print_str_vector(v); print_str_vector(node.content.clone()); diff --git a/src/test/run-pass/issue-3556.rs b/src/test/run-pass/issue-3556.rs index 5a787f8c0ee..bfdf623efda 100644 --- a/src/test/run-pass/issue-3556.rs +++ b/src/test/run-pass/issue-3556.rs @@ -12,10 +12,10 @@ enum Token { Text(@~str), - ETag(@~[~str], @~str), - UTag(@~[~str], @~str), - Section(@~[~str], bool, @~[Token], @~str, @~str, @~str, @~str, @~str), - IncompleteSection(@~[~str], bool, @~str, bool), + ETag(@Vec<~str> , @~str), + UTag(@Vec<~str> , @~str), + Section(@Vec<~str> , bool, @Vec , @~str, @~str, @~str, @~str, @~str), + IncompleteSection(@Vec<~str> , bool, @~str, bool), Partial(@~str, @~str, @~str), } @@ -35,7 +35,7 @@ pub fn main() // assert!(check_strs(fmt!("%?", ETag(@~[~"foo"], @~"bar")), "ETag(@~[ ~\"foo\" ], @~\"bar\")")); let t = Text(@~"foo"); - let u = Section(@~[~"alpha"], true, @~[t], @~"foo", @~"foo", @~"foo", @~"foo", @~"foo"); + let u = Section(@vec!(~"alpha"), true, @vec!(t), @~"foo", @~"foo", @~"foo", @~"foo", @~"foo"); let v = format!("{:?}", u); // this is the line that causes the seg fault assert!(v.len() > 0); } diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/run-pass/issue-3563-3.rs index d06d00a130e..330cfdba245 100644 --- a/src/test/run-pass/issue-3563-3.rs +++ b/src/test/run-pass/issue-3563-3.rs @@ -46,7 +46,7 @@ struct AsciiArt { width: uint, height: uint, fill: char, - lines: ~[~[char]], + lines: Vec > , // This struct can be quite large so we'll disable copying: developers need // to either pass these structs around via references or move them. diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs index 424f4648d8e..c5ae1460a2c 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/run-pass/issue-3609.rs @@ -10,7 +10,7 @@ use std::task; -type RingBuffer = ~[f64]; +type RingBuffer = Vec ; type SamplesFn = proc(samples: &RingBuffer); enum Msg diff --git a/src/test/run-pass/issue-3991.rs b/src/test/run-pass/issue-3991.rs index d5dd090009a..07a520db20b 100644 --- a/src/test/run-pass/issue-3991.rs +++ b/src/test/run-pass/issue-3991.rs @@ -9,7 +9,7 @@ // except according to those terms. struct HasNested { - nest: ~[~[int]], + nest: Vec > , } impl HasNested { diff --git a/src/test/run-pass/issue-4036.rs b/src/test/run-pass/issue-4036.rs index 0298a2a324f..fbd4e2cd742 100644 --- a/src/test/run-pass/issue-4036.rs +++ b/src/test/run-pass/issue-4036.rs @@ -19,5 +19,5 @@ pub fn main() { let json = json::from_str("[1]").unwrap(); let mut decoder = json::Decoder::new(json); - let _x: ~[int] = Decodable::decode(&mut decoder); + let _x: Vec = Decodable::decode(&mut decoder); } diff --git a/src/test/run-pass/issue-5708.rs b/src/test/run-pass/issue-5708.rs index 871ff892909..0a79b1335c8 100644 --- a/src/test/run-pass/issue-5708.rs +++ b/src/test/run-pass/issue-5708.rs @@ -50,7 +50,7 @@ pub fn main() { trait MyTrait { } pub struct MyContainer<'a, T> { - foos: ~[&'a MyTrait], + foos: Vec<&'a MyTrait> , } impl<'a, T> MyContainer<'a, T> { diff --git a/src/test/run-pass/issue-6153.rs b/src/test/run-pass/issue-6153.rs index 989a8e5f9c2..079c2d9a1c4 100644 --- a/src/test/run-pass/issue-6153.rs +++ b/src/test/run-pass/issue-6153.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn swap(f: |~[int]| -> ~[int]) -> ~[int] { - let x = ~[1, 2, 3]; +fn swap(f: |Vec | -> Vec ) -> Vec { + let x = vec!(1, 2, 3); f(x) } diff --git a/src/test/run-pass/issue-8898.rs b/src/test/run-pass/issue-8898.rs index ecb8e3ca0ed..b2918b3ea39 100644 --- a/src/test/run-pass/issue-8898.rs +++ b/src/test/run-pass/issue-8898.rs @@ -19,7 +19,7 @@ pub fn main() { let abc = [1, 2, 3]; let tf = [true, false]; let x = [(), ()]; - let y = ~[(), ()]; + let y = vec!((), ()); let slice = x.slice(0,1); let z = @x; diff --git a/src/test/run-pass/issue-9382.rs b/src/test/run-pass/issue-9382.rs index c5123f23116..6926018bafa 100644 --- a/src/test/run-pass/issue-9382.rs +++ b/src/test/run-pass/issue-9382.rs @@ -32,7 +32,7 @@ pub fn main() { bar: ~32, }; Thing1 { - baz: ~[], + baz: Vec::new(), bar: ~32, }; let _t2_fixed = Thing2 { @@ -40,7 +40,7 @@ pub fn main() { bar: 32, }; Thing2 { - baz: ~[], + baz: Vec::new(), bar: 32, }; } diff --git a/src/test/run-pass/ivec-add.rs b/src/test/run-pass/ivec-add.rs index ecf530f07f3..f215958493f 100644 --- a/src/test/run-pass/ivec-add.rs +++ b/src/test/run-pass/ivec-add.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn double(a: T) -> ~[T] { return ~[a.clone()] + ~[a]; } +fn double(a: T) -> Vec { return vec!(a.clone()) + vec!(a); } -fn double_int(a: int) -> ~[int] { return ~[a] + ~[a]; } +fn double_int(a: int) -> Vec { return vec!(a) + vec!(a); } pub fn main() { let mut d = double(1); diff --git a/src/test/run-pass/ivec-pass-by-value.rs b/src/test/run-pass/ivec-pass-by-value.rs index 4a82e6844b9..cd58689a19e 100644 --- a/src/test/run-pass/ivec-pass-by-value.rs +++ b/src/test/run-pass/ivec-pass-by-value.rs @@ -8,5 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn f(_a: ~[int]) { } -pub fn main() { f(~[1, 2, 3, 4, 5]); } +fn f(_a: Vec ) { } +pub fn main() { f(vec!(1, 2, 3, 4, 5)); } diff --git a/src/test/run-pass/ivec-tag.rs b/src/test/run-pass/ivec-tag.rs index bbfd136464a..81ff6fd7adc 100644 --- a/src/test/run-pass/ivec-tag.rs +++ b/src/test/run-pass/ivec-tag.rs @@ -10,17 +10,17 @@ use std::task; -fn producer(tx: &Sender<~[u8]>) { +fn producer(tx: &Sender>) { tx.send( - ~[1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, 8u8, 9u8, 10u8, 11u8, 12u8, - 13u8]); + vec!(1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, 8u8, 9u8, 10u8, 11u8, 12u8, + 13u8)); } pub fn main() { - let (tx, rx) = channel::<~[u8]>(); + let (tx, rx) = channel::>(); let _prod = task::spawn(proc() { producer(&tx) }); - let _data: ~[u8] = rx.recv(); + let _data: Vec = rx.recv(); } diff --git a/src/test/run-pass/lambda-infer-unresolved.rs b/src/test/run-pass/lambda-infer-unresolved.rs index a664daeb7f8..39eef6526a6 100644 --- a/src/test/run-pass/lambda-infer-unresolved.rs +++ b/src/test/run-pass/lambda-infer-unresolved.rs @@ -11,11 +11,11 @@ // This should typecheck even though the type of e is not fully // resolved when we finish typechecking the ||. -struct Refs { refs: ~[int], n: int } +struct Refs { refs: Vec , n: int } pub fn main() { - let mut e = Refs{refs: ~[], n: 0}; + let mut e = Refs{refs: vec!(), n: 0}; let _f: || = || println!("{}", e.n); - let x: &[int] = e.refs; + let x: &[int] = e.refs.as_slice(); assert_eq!(x.len(), 0); } diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/run-pass/linear-for-loop.rs index 2e788737e4d..4dcc5801faf 100644 --- a/src/test/run-pass/linear-for-loop.rs +++ b/src/test/run-pass/linear-for-loop.rs @@ -9,7 +9,7 @@ // except according to those terms. pub fn main() { - let x = ~[1, 2, 3]; + let x = vec!(1, 2, 3); let mut y = 0; for i in x.iter() { println!("{:?}", *i); y += *i; } println!("{:?}", y); diff --git a/src/test/run-pass/liveness-move-in-loop.rs b/src/test/run-pass/liveness-move-in-loop.rs index d910ac9a4e7..c04a595ac24 100644 --- a/src/test/run-pass/liveness-move-in-loop.rs +++ b/src/test/run-pass/liveness-move-in-loop.rs @@ -11,7 +11,7 @@ fn take(x: int) -> int {x} fn the_loop() { - let mut list = ~[]; + let mut list = Vec::new(); loop { let x = 5; if x > 3 { diff --git a/src/test/run-pass/log-poly.rs b/src/test/run-pass/log-poly.rs index b4a67328481..69685b58ab5 100644 --- a/src/test/run-pass/log-poly.rs +++ b/src/test/run-pass/log-poly.rs @@ -16,5 +16,5 @@ pub fn main() { println!("{}", 1); println!("{}", 2.0); println!("{:?}", Three); - println!("{:?}", ~[4]); + println!("{:?}", vec!(4)); } diff --git a/src/test/run-pass/log-str.rs b/src/test/run-pass/log-str.rs index 8859b533626..c912fd68a6c 100644 --- a/src/test/run-pass/log-str.rs +++ b/src/test/run-pass/log-str.rs @@ -11,9 +11,9 @@ use std::repr; pub fn main() { - let act = repr::repr_to_str(&~[1, 2, 3]); + let act = repr::repr_to_str(&vec!(1, 2, 3)); assert_eq!(~"~[1, 2, 3]", act); - let act = format!("{:?}/{:6?}", ~[1, 2, 3], ~"hi"); + let act = format!("{:?}/{:6?}", vec!(1, 2, 3), ~"hi"); assert_eq!(act, ~"~[1, 2, 3]/~\"hi\" "); } diff --git a/src/test/run-pass/loop-scope.rs b/src/test/run-pass/loop-scope.rs index 436bdf256ca..1dc3700194c 100644 --- a/src/test/run-pass/loop-scope.rs +++ b/src/test/run-pass/loop-scope.rs @@ -9,7 +9,7 @@ // except according to those terms. pub fn main() { - let x = ~[10, 20, 30]; + let x = vec!(10, 20, 30); let mut sum = 0; for x in x.iter() { sum += *x; } assert_eq!(sum, 60); diff --git a/src/test/run-pass/match-join.rs b/src/test/run-pass/match-join.rs index 47b2ddd5022..a9039885296 100644 --- a/src/test/run-pass/match-join.rs +++ b/src/test/run-pass/match-join.rs @@ -10,7 +10,7 @@ fn foo(y: Option) { let mut x: int; - let mut rs: ~[int] = ~[]; + let mut rs: Vec = Vec::new(); /* tests that x doesn't get put in the precondition for the entire if expression */ diff --git a/src/test/run-pass/match-vec-rvalue.rs b/src/test/run-pass/match-vec-rvalue.rs index 20693897236..ba8ba6263df 100644 --- a/src/test/run-pass/match-vec-rvalue.rs +++ b/src/test/run-pass/match-vec-rvalue.rs @@ -11,7 +11,7 @@ // Tests that matching rvalues with drops does not crash. pub fn main() { - match ~[1, 2, 3] { + match vec!(1, 2, 3) { x => { assert_eq!(x.len(), 3); assert_eq!(x[0], 1); diff --git a/src/test/run-pass/mod-view-items.rs b/src/test/run-pass/mod-view-items.rs index e9fb74b4e6e..b05a5702910 100644 --- a/src/test/run-pass/mod-view-items.rs +++ b/src/test/run-pass/mod-view-items.rs @@ -17,8 +17,7 @@ // begin failing. mod m { - use std::slice; - pub fn f() -> ~[int] { slice::from_elem(1u, 0) } + pub fn f() -> Vec { Vec::from_elem(1u, 0) } } pub fn main() { let _x = m::f(); } diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs index 42e782928b8..5df6738797d 100644 --- a/src/test/run-pass/monad.rs +++ b/src/test/run-pass/monad.rs @@ -11,12 +11,12 @@ // ignore-fast trait vec_monad { - fn bind(&self, f: |&A| -> ~[B]) -> ~[B]; + fn bind(&self, f: |&A| -> Vec ) -> Vec ; } -impl vec_monad for ~[A] { - fn bind(&self, f: |&A| -> ~[B]) -> ~[B] { - let mut r = ~[]; +impl vec_monad for Vec { + fn bind(&self, f: |&A| -> Vec ) -> Vec { + let mut r = Vec::new(); for elt in self.iter() { r.push_all_move(f(elt)); } @@ -44,8 +44,8 @@ fn transform(x: Option) -> Option<~str> { pub fn main() { assert_eq!(transform(Some(10)), Some(~"11")); assert_eq!(transform(None), None); - assert!((~[~"hi"]) - .bind(|x| ~[x.clone(), *x + "!"] ) - .bind(|x| ~[x.clone(), *x + "?"] ) == - ~[~"hi", ~"hi?", ~"hi!", ~"hi!?"]); + assert!((vec!(~"hi")) + .bind(|x| vec!(x.clone(), *x + "!") ) + .bind(|x| vec!(x.clone(), *x + "?") ) == + vec!(~"hi", ~"hi?", ~"hi!", ~"hi!?")); } diff --git a/src/test/run-pass/morestack6.rs b/src/test/run-pass/morestack6.rs index c09b90ba6fb..440acbcf4da 100644 --- a/src/test/run-pass/morestack6.rs +++ b/src/test/run-pass/morestack6.rs @@ -61,13 +61,14 @@ fn runtest2(f: extern fn(), frame_backoff: u32, last_stk: *u8) -> u32 { pub fn main() { use rand::Rng; - let fns = ~[ + let fns = vec!( calllink01, calllink02, calllink08, calllink10 - ]; + ); let mut rng = rand::task_rng(); + for f in fns.iter() { let f = *f; let sz = rng.gen::() % 256u32 + 256u32; diff --git a/src/test/run-pass/move-arg-2-unique.rs b/src/test/run-pass/move-arg-2-unique.rs index ed3cdc81c31..b27914fff80 100644 --- a/src/test/run-pass/move-arg-2-unique.rs +++ b/src/test/run-pass/move-arg-2-unique.rs @@ -8,13 +8,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn test(foo: ~~[int]) { assert!((foo[0] == 10)); } +fn test(foo: ~Vec ) { assert!((foo[0] == 10)); } pub fn main() { - let x = ~~[10]; + let x = ~vec!(10); // Test forgetting a local by move-in test(x); // Test forgetting a temporary by move-in. - test(~~[10]); + test(~vec!(10)); } diff --git a/src/test/run-pass/move-arg-2.rs b/src/test/run-pass/move-arg-2.rs index 18cee34c25c..2cc56ec9227 100644 --- a/src/test/run-pass/move-arg-2.rs +++ b/src/test/run-pass/move-arg-2.rs @@ -10,13 +10,13 @@ #[feature(managed_boxes)]; -fn test(foo: @~[int]) { assert!((foo[0] == 10)); } +fn test(foo: @Vec ) { assert!((foo[0] == 10)); } pub fn main() { - let x = @~[10]; + let x = @vec!(10); // Test forgetting a local by move-in test(x); // Test forgetting a temporary by move-in. - test(@~[10]); + test(@vec!(10)); } diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/run-pass/mutable-alias-vec.rs index e01128554c7..eb236b29263 100644 --- a/src/test/run-pass/mutable-alias-vec.rs +++ b/src/test/run-pass/mutable-alias-vec.rs @@ -8,12 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn grow(v: &mut ~[int]) { +fn grow(v: &mut Vec) { v.push(1); } pub fn main() { - let mut v: ~[int] = ~[]; + let mut v: Vec = Vec::new(); grow(&mut v); grow(&mut v); grow(&mut v); diff --git a/src/test/run-pass/mutable-vec-drop.rs b/src/test/run-pass/mutable-vec-drop.rs index 2a04ca4ccd2..9a83907c66f 100644 --- a/src/test/run-pass/mutable-vec-drop.rs +++ b/src/test/run-pass/mutable-vec-drop.rs @@ -15,6 +15,6 @@ struct Pair { a: int, b: int} pub fn main() { // This just tests whether the vec leaks its members. - let mut _pvec: ~[@Pair] = - ~[@Pair{a: 1, b: 2}, @Pair{a: 3, b: 4}, @Pair{a: 5, b: 6}]; + let mut _pvec: Vec<@Pair> = + vec!(@Pair{a: 1, b: 2}, @Pair{a: 3, b: 4}, @Pair{a: 5, b: 6}); } diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs index 7bc28e6b00f..20e2675fccf 100644 --- a/src/test/run-pass/newtype-polymorphic.rs +++ b/src/test/run-pass/newtype-polymorphic.rs @@ -9,9 +9,9 @@ // except according to those terms. #[deriving(Clone)] -struct myvec(~[X]); +struct myvec(Vec ); -fn myvec_deref(mv: myvec) -> ~[X] { +fn myvec_deref(mv: myvec) -> Vec { let myvec(v) = mv; return v.clone(); } @@ -22,7 +22,7 @@ fn myvec_elt(mv: myvec) -> X { } pub fn main() { - let mv = myvec(~[1, 2, 3]); + let mv = myvec(vec!(1, 2, 3)); assert_eq!(myvec_deref(mv.clone())[1], 2); assert_eq!(myvec_elt(mv.clone()), 1); let myvec(v) = mv; diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs index a922201c41a..117cd6d572e 100644 --- a/src/test/run-pass/nullable-pointer-iotareduction.rs +++ b/src/test/run-pass/nullable-pointer-iotareduction.rs @@ -77,7 +77,7 @@ pub fn main() { check_type!(~18: ~int); check_type!(@19: @int); check_type!(~"foo": ~str); - check_type!(~[20, 22]: ~[int]); + check_type!(vec!(20, 22): Vec ); let mint: uint = unsafe { cast::transmute(main) }; check_type!(main: fn(), |pthing| { assert!(mint == unsafe { cast::transmute(*pthing) }) diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/run-pass/nullable-pointer-size.rs index 84a6baa5de8..9ce68fa8ffc 100644 --- a/src/test/run-pass/nullable-pointer-size.rs +++ b/src/test/run-pass/nullable-pointer-size.rs @@ -41,6 +41,6 @@ pub fn main() { check_type!(~int); check_type!(@int); check_type!(~str); - check_type!(~[int]); + check_type!(Vec ); check_type!(extern fn()); } diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-header.rs b/src/test/run-pass/objects-owned-object-borrowed-method-header.rs index 24c1b9d8fe8..7a0c7b34d2f 100644 --- a/src/test/run-pass/objects-owned-object-borrowed-method-header.rs +++ b/src/test/run-pass/objects-owned-object-borrowed-method-header.rs @@ -31,11 +31,11 @@ fn foo(&self) -> uint { } pub fn main() { - let foos: ~[ ~FooTrait: ] = ~[ + let foos: vec!( ~FooTrait: ) = vec!( ~BarStruct{ x: @0 } as ~FooTrait:, ~BarStruct{ x: @1 } as ~FooTrait:, ~BarStruct{ x: @2 } as ~FooTrait: - ]; + ); for i in range(0u, foos.len()) { assert_eq!(i, foos[i].foo()); diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs index 72ae7cf9bb9..f9f59f88bf1 100644 --- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs +++ b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs @@ -27,11 +27,11 @@ fn foo(&self) -> uint { } pub fn main() { - let foos: ~[ ~FooTrait ] = ~[ + let foos: vec!( ~FooTrait ) = vec!( ~BarStruct{ x: 0 } as ~FooTrait, ~BarStruct{ x: 1 } as ~FooTrait, ~BarStruct{ x: 2 } as ~FooTrait - ]; + ); for i in range(0u, foos.len()) { assert_eq!(i, foos[i].foo()); diff --git a/src/test/run-pass/overload-index-operator.rs b/src/test/run-pass/overload-index-operator.rs index b475222619d..865e1cc601b 100644 --- a/src/test/run-pass/overload-index-operator.rs +++ b/src/test/run-pass/overload-index-operator.rs @@ -14,8 +14,7 @@ use std::ops::Index; struct AssociationList { - pairs: ~[AssociationPair] -} + pairs: Vec> } #[deriving(Clone)] struct AssociationPair { @@ -44,7 +43,7 @@ pub fn main() { let foo = ~"foo"; let bar = ~"bar"; - let mut list = AssociationList {pairs: ~[]}; + let mut list = AssociationList {pairs: Vec::new()}; list.push(foo.clone(), 22); list.push(bar.clone(), 44); diff --git a/src/test/run-pass/overloaded-deref.rs b/src/test/run-pass/overloaded-deref.rs index 86046e8e05d..0ff282b68f8 100644 --- a/src/test/run-pass/overloaded-deref.rs +++ b/src/test/run-pass/overloaded-deref.rs @@ -42,7 +42,7 @@ pub fn main() { (*(*p).borrow_mut()).y += 3; assert_eq!(*(*p).borrow(), Point {x: 3, y: 5}); - let v = Rc::new(RefCell::new(~[1, 2, 3])); + let v = Rc::new(RefCell::new(vec!(1, 2, 3))); (*(*v).borrow_mut())[0] = 3; (*(*v).borrow_mut())[1] += 3; assert_eq!(((*(*v).borrow())[0], (*(*v).borrow())[1], (*(*v).borrow())[2]), (3, 5, 3)); diff --git a/src/test/run-pass/packed-struct-generic-size.rs b/src/test/run-pass/packed-struct-generic-size.rs index 0b6ab579e6b..b297fc7e13f 100644 --- a/src/test/run-pass/packed-struct-generic-size.rs +++ b/src/test/run-pass/packed-struct-generic-size.rs @@ -22,6 +22,6 @@ pub fn main() { assert_eq!(mem::size_of::>(), 11); - assert_eq!(mem::size_of::>(), - 1 + mem::size_of::<~str>() + mem::size_of::<~[int]>()); + assert_eq!(mem::size_of:: >>(), + 1 + mem::size_of::<~str>() + mem::size_of:: >()); } diff --git a/src/test/run-pass/pure-sum.rs b/src/test/run-pass/pure-sum.rs index 17eab78f820..d5f1caaf74d 100644 --- a/src/test/run-pass/pure-sum.rs +++ b/src/test/run-pass/pure-sum.rs @@ -10,7 +10,7 @@ // Check that functions can modify local state. -fn sums_to(v: ~[int], sum: int) -> bool { +fn sums_to(v: Vec , sum: int) -> bool { let mut i = 0u; let mut sum0 = 0; while i < v.len() { @@ -20,7 +20,7 @@ fn sums_to(v: ~[int], sum: int) -> bool { return sum0 == sum; } -fn sums_to_using_uniq(v: ~[int], sum: int) -> bool { +fn sums_to_using_uniq(v: Vec , sum: int) -> bool { let mut i = 0u; let mut sum0 = ~0; while i < v.len() { @@ -30,7 +30,7 @@ fn sums_to_using_uniq(v: ~[int], sum: int) -> bool { return *sum0 == sum; } -fn sums_to_using_rec(v: ~[int], sum: int) -> bool { +fn sums_to_using_rec(v: Vec , sum: int) -> bool { let mut i = 0u; let mut sum0 = F {f: 0}; while i < v.len() { @@ -42,7 +42,7 @@ fn sums_to_using_rec(v: ~[int], sum: int) -> bool { struct F { f: T } -fn sums_to_using_uniq_rec(v: ~[int], sum: int) -> bool { +fn sums_to_using_uniq_rec(v: Vec , sum: int) -> bool { let mut i = 0u; let mut sum0 = F {f: ~0}; while i < v.len() { diff --git a/src/test/run-pass/rcvr-borrowed-to-slice.rs b/src/test/run-pass/rcvr-borrowed-to-slice.rs index b958588622f..8597bf39e0e 100644 --- a/src/test/run-pass/rcvr-borrowed-to-slice.rs +++ b/src/test/run-pass/rcvr-borrowed-to-slice.rs @@ -22,17 +22,17 @@ fn sum_(self) -> int { fn call_sum(x: &[int]) -> int { x.sum_() } pub fn main() { - let x = ~[1, 2, 3]; + let x = vec!(1, 2, 3); let y = call_sum(x); println!("y=={}", y); assert_eq!(y, 6); - let x = ~[1, 2, 3]; + let x = vec!(1, 2, 3); let y = x.sum_(); println!("y=={}", y); assert_eq!(y, 6); - let x = ~[1, 2, 3]; + let x = vec!(1, 2, 3); let y = x.sum_(); println!("y=={}", y); assert_eq!(y, 6); diff --git a/src/test/run-pass/reflect-visit-type.rs b/src/test/run-pass/reflect-visit-type.rs index 6f91497a81c..22f30141028 100644 --- a/src/test/run-pass/reflect-visit-type.rs +++ b/src/test/run-pass/reflect-visit-type.rs @@ -13,7 +13,7 @@ use std::intrinsics::{TyDesc, get_tydesc, visit_tydesc, TyVisitor, Disr, Opaque}; struct MyVisitor { - types: ~[~str], + types: Vec<~str> , } impl TyVisitor for MyVisitor { @@ -145,16 +145,16 @@ fn visit_ty(v: &mut MyVisitor) { } pub fn main() { - let mut v = MyVisitor {types: ~[]}; + let mut v = MyVisitor {types: Vec::new()}; visit_ty::(&mut v); visit_ty::(&mut v); visit_ty::(&mut v); visit_ty::(&mut v); - visit_ty::<~[int]>(&mut v); + visit_ty:: >(&mut v); for s in v.types.iter() { println!("type: {}", (*s).clone()); } - assert_eq!(v.types.clone(), ~[~"bool", ~"int", ~"i8", ~"i16", ~"[", ~"int", ~"]"]); + assert_eq!(v.types.clone(), vec!(~"bool", ~"int", ~"i8", ~"i16", ~"[", ~"int", ~"]")); } diff --git a/src/test/run-pass/regions-borrow-evec-uniq.rs b/src/test/run-pass/regions-borrow-evec-uniq.rs index 914c51eaa70..b17b025eb58 100644 --- a/src/test/run-pass/regions-borrow-evec-uniq.rs +++ b/src/test/run-pass/regions-borrow-evec-uniq.rs @@ -13,11 +13,11 @@ fn foo(x: &[int]) -> int { } pub fn main() { - let p = ~[1,2,3,4,5]; + let p = vec!(1,2,3,4,5); let r = foo(p); assert_eq!(r, 1); - let p = ~[5,4,3,2,1]; + let p = vec!(5,4,3,2,1); let r = foo(p); assert_eq!(r, 5); } diff --git a/src/test/run-pass/regions-dependent-addr-of.rs b/src/test/run-pass/regions-dependent-addr-of.rs index de619685ca4..3b5ff3f6092 100644 --- a/src/test/run-pass/regions-dependent-addr-of.rs +++ b/src/test/run-pass/regions-dependent-addr-of.rs @@ -18,7 +18,7 @@ struct A { struct B { v1: int, v2: [int, ..3], - v3: ~[int], + v3: Vec , v4: C, v5: ~C, v6: Option @@ -84,7 +84,7 @@ fn get_v5_ref<'v>(a: &'v A, _i: uint) -> &'v int { pub fn main() { let a = A {value: B {v1: 22, v2: [23, 24, 25], - v3: ~[26, 27, 28], + v3: vec!(26, 27, 28), v4: C { f: 29 }, v5: ~C { f: 30 }, v6: Some(C { f: 31 })}}; diff --git a/src/test/run-pass/regions-dependent-autoslice.rs b/src/test/run-pass/regions-dependent-autoslice.rs index dab881549c4..8cbdff6691a 100644 --- a/src/test/run-pass/regions-dependent-autoslice.rs +++ b/src/test/run-pass/regions-dependent-autoslice.rs @@ -18,6 +18,6 @@ fn both<'r>(v: &'r [uint]) -> &'r [uint] { } pub fn main() { - let v = ~[1,2,3]; + let v = vec!(1,2,3); both(v); } diff --git a/src/test/run-pass/regions-infer-borrow-scope-view.rs b/src/test/run-pass/regions-infer-borrow-scope-view.rs index 8f7452f2d06..67542a5ded1 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-view.rs +++ b/src/test/run-pass/regions-infer-borrow-scope-view.rs @@ -11,7 +11,7 @@ fn view<'r, T>(x: &'r [T]) -> &'r [T] {x} pub fn main() { - let v = ~[1, 2, 3]; + let v = vec!(1, 2, 3); let x = view(v); let y = view(x); assert!((v[0] == x[0]) && (v[0] == y[0])); diff --git a/src/test/run-pass/regions-mock-tcx.rs b/src/test/run-pass/regions-mock-tcx.rs index c8e8c045614..7c87c858d42 100644 --- a/src/test/run-pass/regions-mock-tcx.rs +++ b/src/test/run-pass/regions-mock-tcx.rs @@ -44,7 +44,7 @@ fn eq(&self, other: &TypeStructure<'tcx>) -> bool { struct TypeContext<'tcx, 'ast> { ty_arena: &'tcx Arena, - types: ~[Type<'tcx>], + types: Vec> , type_table: HashMap>, ast_arena: &'ast Arena, @@ -55,7 +55,7 @@ impl<'tcx,'ast> TypeContext<'tcx, 'ast> { fn new(ty_arena: &'tcx Arena, ast_arena: &'ast Arena) -> TypeContext<'tcx, 'ast> { TypeContext { ty_arena: ty_arena, - types: ~[], + types: Vec::new(), type_table: HashMap::new(), ast_arena: ast_arena, diff --git a/src/test/run-pass/seq-compare.rs b/src/test/run-pass/seq-compare.rs index 86907bdf2a3..ddb34edad98 100644 --- a/src/test/run-pass/seq-compare.rs +++ b/src/test/run-pass/seq-compare.rs @@ -14,13 +14,13 @@ pub fn main() { assert!((~"hello" < ~"hellr")); assert!((~"hello " > ~"hello")); assert!((~"hello" != ~"there")); - assert!((~[1, 2, 3, 4] > ~[1, 2, 3])); - assert!((~[1, 2, 3] < ~[1, 2, 3, 4])); - assert!((~[1, 2, 4, 4] > ~[1, 2, 3, 4])); - assert!((~[1, 2, 3, 4] < ~[1, 2, 4, 4])); - assert!((~[1, 2, 3] <= ~[1, 2, 3])); - assert!((~[1, 2, 3] <= ~[1, 2, 3, 3])); - assert!((~[1, 2, 3, 4] > ~[1, 2, 3])); - assert_eq!(~[1, 2, 3], ~[1, 2, 3]); - assert!((~[1, 2, 3] != ~[1, 1, 3])); + assert!((vec!(1, 2, 3, 4) > vec!(1, 2, 3))); + assert!((vec!(1, 2, 3) < vec!(1, 2, 3, 4))); + assert!((vec!(1, 2, 4, 4) > vec!(1, 2, 3, 4))); + assert!((vec!(1, 2, 3, 4) < vec!(1, 2, 4, 4))); + assert!((vec!(1, 2, 3) <= vec!(1, 2, 3))); + assert!((vec!(1, 2, 3) <= vec!(1, 2, 3, 3))); + assert!((vec!(1, 2, 3, 4) > vec!(1, 2, 3))); + assert_eq!(vec!(1, 2, 3), vec!(1, 2, 3)); + assert!((vec!(1, 2, 3) != vec!(1, 1, 3))); } diff --git a/src/test/run-pass/shadow.rs b/src/test/run-pass/shadow.rs index b277c16dc4a..e4b96856560 100644 --- a/src/test/run-pass/shadow.rs +++ b/src/test/run-pass/shadow.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn foo(c: ~[int]) { +fn foo(c: Vec ) { let a: int = 5; - let mut b: ~[int] = ~[]; + let mut b: Vec = Vec::new(); match none:: { @@ -27,4 +27,4 @@ fn foo(c: ~[int]) { enum t { none, some(T), } -pub fn main() { let x = 10; let x = x + 20; assert!((x == 30)); foo(~[]); } +pub fn main() { let x = 10; let x = x + 20; assert!((x == 30)); foo(Vec::new()); } diff --git a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs index b74f080ede7..058041ff710 100644 --- a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs +++ b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs @@ -40,8 +40,8 @@ struct Spanned { #[deriving(Clone)] struct Path_ { global: bool, - idents: ~[~str], - types: ~[@ty], + idents: Vec<~str> , + types: vec!(@ty), } type path = Spanned; @@ -56,7 +56,7 @@ struct X { pub fn main() { let sp: Span = Span {lo: 57451u, hi: 57542u, expanded_from: os_none}; let t: @ty = @Spanned { data: 3u, span: sp }; - let p_: Path_ = Path_ { global: true, idents: ~[~"hi"], types: ~[t] }; + let p_: Path_ = Path_ { global: true, idents: vec!(~"hi"), types: Vec }; let p: path = Spanned { data: p_, span: sp }; let x = X { sp: sp, path: p }; println!("{:?}", x.path.clone()); diff --git a/src/test/run-pass/size-and-align.rs b/src/test/run-pass/size-and-align.rs index 5731b8de529..f43011df4c2 100644 --- a/src/test/run-pass/size-and-align.rs +++ b/src/test/run-pass/size-and-align.rs @@ -13,7 +13,7 @@ enum clam { a(T, int), b, } -fn uhoh(v: ~[clam]) { +fn uhoh(v: Vec> ) { match v[1] { a::(ref _t, ref u) => { println!("incorrect"); @@ -25,6 +25,6 @@ fn uhoh(v: ~[clam]) { } pub fn main() { - let v: ~[clam] = ~[b::, b::, a::(42, 17)]; + let v: Vec> = vec!(b::, b::, a::(42, 17)); uhoh::(v); } diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs index bdfd40e8600..d727f66d948 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/run-pass/static-impl.rs @@ -40,14 +40,14 @@ fn multi(&self, f: |uint|) { trait vec_utils { fn length_(&self, ) -> uint; fn iter_(&self, f: |&T|); - fn map_(&self, f: |&T| -> U) -> ~[U]; + fn map_(&self, f: |&T| -> U) -> Vec ; } -impl vec_utils for ~[T] { +impl vec_utils for Vec { fn length_(&self) -> uint { self.len() } fn iter_(&self, f: |&T|) { for x in self.iter() { f(x); } } - fn map_(&self, f: |&T| -> U) -> ~[U] { - let mut r = ~[]; + fn map_(&self, f: |&T| -> U) -> Vec { + let mut r = Vec::new(); for elt in self.iter() { r.push(f(elt)); } @@ -59,9 +59,9 @@ pub fn main() { assert_eq!(10u.plus(), 30); assert_eq!((~"hi").plus(), 200); - assert_eq!((~[1]).length_().str(), ~"1"); - assert_eq!((~[3, 4]).map_(|a| *a + 4 )[0], 7); - assert_eq!((~[3, 4]).map_::(|a| *a as uint + 4u )[0], 7u); + assert_eq!((vec!(1)).length_().str(), ~"1"); + assert_eq!((vec!(3, 4)).map_(|a| *a + 4 )[0], 7); + assert_eq!((vec!(3, 4)).map_::(|a| *a as uint + 4u )[0], 7u); let mut x = 0u; 10u.multi(|_n| x += 2u ); assert_eq!(x, 20u); diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs index 208700fde8a..1dbd29a781e 100644 --- a/src/test/run-pass/swap-2.rs +++ b/src/test/run-pass/swap-2.rs @@ -11,7 +11,7 @@ use std::mem::swap; pub fn main() { - let mut a: ~[int] = ~[0, 1, 2, 3, 4, 5, 6]; + let mut a: Vec = vec!(0, 1, 2, 3, 4, 5, 6); a.swap(2, 4); assert_eq!(a[2], 4); assert_eq!(a[4], 2); diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs index 43fbfe85352..416aaec40f1 100644 --- a/src/test/run-pass/task-comm-16.rs +++ b/src/test/run-pass/task-comm-16.rs @@ -26,7 +26,7 @@ struct R {val0: int, val1: u8, val2: char} fn test_vec() { let (tx, rx) = channel(); - let v0: ~[int] = ~[0, 1, 2]; + let v0: Vec = vec!(0, 1, 2); tx.send(v0); let v1 = rx.recv(); assert_eq!(v1[0], 0); diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index 176b64e41d0..a239a2de78a 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -36,7 +36,7 @@ fn test00() { let mut i: int = 0; // Create and spawn tasks... - let mut results = ~[]; + let mut results = Vec::new(); while i < number_of_tasks { let tx = tx.clone(); let mut builder = task::task(); diff --git a/src/test/run-pass/trait-bounds-in-arc.rs b/src/test/run-pass/trait-bounds-in-arc.rs index 0ed4fdb2c05..7d37993ad75 100644 --- a/src/test/run-pass/trait-bounds-in-arc.rs +++ b/src/test/run-pass/trait-bounds-in-arc.rs @@ -65,10 +65,10 @@ pub fn main() { let dogge1 = Dogge { bark_decibels: 100, tricks_known: 42, name: ~"alan_turing" }; let dogge2 = Dogge { bark_decibels: 55, tricks_known: 11, name: ~"albert_einstein" }; let fishe = Goldfyshe { swim_speed: 998, name: ~"alec_guinness" }; - let arc = Arc::new(~[~catte as ~Pet:Share+Send, + let arc = Arc::new(vec!(~catte as ~Pet:Share+Send, ~dogge1 as ~Pet:Share+Send, ~fishe as ~Pet:Share+Send, - ~dogge2 as ~Pet:Share+Send]); + ~dogge2 as ~Pet:Share+Send)); let (tx1, rx1) = channel(); let arc1 = arc.clone(); task::spawn(proc() { check_legs(arc1); tx1.send(()); }); @@ -83,21 +83,29 @@ pub fn main() { rx3.recv(); } -fn check_legs(arc: Arc<~[~Pet:Share+Send]>) { +fn check_legs(arc: Arc>) { let mut legs = 0; for pet in arc.get().iter() { legs += pet.num_legs(); } assert!(legs == 12); } +<<<<<<< HEAD fn check_names(arc: Arc<~[~Pet:Share+Send]>) { +======= +fn check_names(arc: Arc >) { +>>>>>>> test: Automatically remove all `~[T]` from tests. for pet in arc.get().iter() { pet.name(|name| { assert!(name[0] == 'a' as u8 && name[1] == 'l' as u8); }) } } +<<<<<<< HEAD fn check_pedigree(arc: Arc<~[~Pet:Share+Send]>) { +======= +fn check_pedigree(arc: Arc >) { +>>>>>>> test: Automatically remove all `~[T]` from tests. for pet in arc.get().iter() { assert!(pet.of_good_pedigree()); } diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs index 12bf4eef44a..a75a1b61c59 100644 --- a/src/test/run-pass/trait-generic.rs +++ b/src/test/run-pass/trait-generic.rs @@ -24,11 +24,11 @@ fn to_string(&self) -> ~str { ~"()" } } trait map { - fn map(&self, f: |&T| -> U) -> ~[U]; + fn map(&self, f: |&T| -> U) -> Vec ; } -impl map for ~[T] { - fn map(&self, f: |&T| -> U) -> ~[U] { - let mut r = ~[]; +impl map for Vec { + fn map(&self, f: |&T| -> U) -> Vec { + let mut r = Vec::new(); // FIXME: #7355 generates bad code with VecIterator for i in range(0u, self.len()) { r.push(f(&self[i])); @@ -37,16 +37,16 @@ fn map(&self, f: |&T| -> U) -> ~[U] { } } -fn foo>(x: T) -> ~[~str] { +fn foo>(x: T) -> Vec<~str> { x.map(|_e| ~"hi" ) } -fn bar>(x: T) -> ~[~str] { +fn bar>(x: T) -> Vec<~str> { x.map(|_e| _e.to_string() ) } pub fn main() { - assert_eq!(foo(~[1]), ~[~"hi"]); - assert_eq!(bar::(~[4, 5]), ~[~"4", ~"5"]); - assert_eq!(bar::<~str, ~[~str]>(~[~"x", ~"y"]), ~[~"x", ~"y"]); - assert_eq!(bar::<(), ~[()]>(~[()]), ~[~"()"]); + assert_eq!(foo(vec!(1)), vec!(~"hi")); + assert_eq!(bar:: >(vec!(4, 5)), vec!(~"4", ~"5")); + assert_eq!(bar::<~str, Vec<~str> >(vec!(~"x", ~"y")), vec!(~"x", ~"y")); + assert_eq!(bar::<(), vec!(())>(vec!(())), vec!(~"()")); } diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs index b6468b4483d..f16f5c1a419 100644 --- a/src/test/run-pass/trait-to-str.rs +++ b/src/test/run-pass/trait-to-str.rs @@ -18,7 +18,7 @@ impl to_str for int { fn to_string(&self) -> ~str { self.to_str() } } -impl to_str for ~[T] { +impl to_str for Vec { fn to_string(&self) -> ~str { format!("[{}]", self.iter().map(|e| e.to_string()).to_owned_vec().connect(", ")) } @@ -26,15 +26,15 @@ fn to_string(&self) -> ~str { pub fn main() { assert!(1.to_string() == ~"1"); - assert!((~[2, 3, 4]).to_string() == ~"[2, 3, 4]"); + assert!((vec!(2, 3, 4)).to_string() == ~"[2, 3, 4]"); fn indirect(x: T) -> ~str { x.to_string() + "!" } - assert!(indirect(~[10, 20]) == ~"[10, 20]!"); + assert!(indirect(vec!(10, 20)) == ~"[10, 20]!"); fn indirect2(x: T) -> ~str { indirect(x) } - assert!(indirect2(~[1]) == ~"[1]!"); + assert!(indirect2(vec!(1)) == ~"[1]!"); } diff --git a/src/test/run-pass/tydesc-name.rs b/src/test/run-pass/tydesc-name.rs index b3835ad5cdf..f37bfe19ad3 100644 --- a/src/test/run-pass/tydesc-name.rs +++ b/src/test/run-pass/tydesc-name.rs @@ -19,7 +19,7 @@ struct Foo { pub fn main() { unsafe { assert_eq!((*get_tydesc::()).name, "int"); - assert_eq!((*get_tydesc::<~[int]>()).name, "~[int]"); + assert_eq!((*get_tydesc:: >()).name, "~[int]"); assert_eq!((*get_tydesc::>()).name, "Foo"); } } diff --git a/src/test/run-pass/type-params-in-for-each.rs b/src/test/run-pass/type-params-in-for-each.rs index ff7ffb6dc6f..b8312bcb282 100644 --- a/src/test/run-pass/type-params-in-for-each.rs +++ b/src/test/run-pass/type-params-in-for-each.rs @@ -18,9 +18,9 @@ fn range_(lo: uint, hi: uint, it: |uint|) { while lo_ < hi { it(lo_); lo_ += 1u; } } -fn create_index(_index: ~[S], _hash_fn: extern fn(T) -> uint) { +fn create_index(_index: Vec> , _hash_fn: extern fn(T) -> uint) { range_(0u, 256u, |_i| { - let _bucket: ~[T] = ~[]; + let _bucket: Vec = Vec::new(); }) } diff --git a/src/test/run-pass/unique-assign-generic.rs b/src/test/run-pass/unique-assign-generic.rs index 8fb2b9b40f4..1af120df470 100644 --- a/src/test/run-pass/unique-assign-generic.rs +++ b/src/test/run-pass/unique-assign-generic.rs @@ -18,6 +18,6 @@ fn f(t: T) -> T { pub fn main() { let t = f(~100); assert_eq!(t, ~100); - let t = f(~@~[100]); - assert_eq!(t, ~@~[100]); + let t = f(~@vec!(100)); + assert_eq!(t, ~@vec!(100)); } diff --git a/src/test/run-pass/unique-autoderef-index.rs b/src/test/run-pass/unique-autoderef-index.rs index 46f9ca794a9..1c026bf91d1 100644 --- a/src/test/run-pass/unique-autoderef-index.rs +++ b/src/test/run-pass/unique-autoderef-index.rs @@ -9,6 +9,6 @@ // except according to those terms. pub fn main() { - let i = ~~[100]; + let i = ~vec!(100); assert_eq!(i[0], 100); } diff --git a/src/test/run-pass/unique-create.rs b/src/test/run-pass/unique-create.rs index 9570c17c865..023917ec2e9 100644 --- a/src/test/run-pass/unique-create.rs +++ b/src/test/run-pass/unique-create.rs @@ -13,5 +13,5 @@ pub fn main() { } fn vec() { - ~[0]; + vec!(0); } diff --git a/src/test/run-pass/unique-drop-complex.rs b/src/test/run-pass/unique-drop-complex.rs index 2090352f9ce..eb8fa640a0f 100644 --- a/src/test/run-pass/unique-drop-complex.rs +++ b/src/test/run-pass/unique-drop-complex.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn main() { - let _x = ~~[0,0,0,0,0]; + let _x = ~vec!(0,0,0,0,0); } diff --git a/src/test/run-pass/unique-in-vec-copy.rs b/src/test/run-pass/unique-in-vec-copy.rs index 3a27d7844bc..762afbe15e8 100644 --- a/src/test/run-pass/unique-in-vec-copy.rs +++ b/src/test/run-pass/unique-in-vec-copy.rs @@ -9,7 +9,7 @@ // except according to those terms. pub fn main() { - let mut a = ~[~10]; + let mut a = vec!(~10); let b = a.clone(); assert_eq!(*a[0], 10); diff --git a/src/test/run-pass/unique-in-vec.rs b/src/test/run-pass/unique-in-vec.rs index 51fceae39b4..7f0aa93042a 100644 --- a/src/test/run-pass/unique-in-vec.rs +++ b/src/test/run-pass/unique-in-vec.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn main() { - assert!((~[~100])[0] == ~100); + assert!((vec!(~100))[0] == ~100); } diff --git a/src/test/run-pass/vec-drop.rs b/src/test/run-pass/vec-drop.rs index d34350e9696..270b1cb895d 100644 --- a/src/test/run-pass/vec-drop.rs +++ b/src/test/run-pass/vec-drop.rs @@ -15,6 +15,6 @@ struct Pair { x: int, y: int } pub fn main() { // This just tests whether the vec leaks its members. - let _pvec: ~[@Pair] = - ~[@Pair{x: 1, y: 2}, @Pair{x: 3, y: 4}, @Pair{x: 5, y: 6}]; + let _pvec: Vec<@Pair> = + vec!(@Pair{x: 1, y: 2}, @Pair{x: 3, y: 4}, @Pair{x: 5, y: 6}); } diff --git a/src/test/run-pass/vec-growth.rs b/src/test/run-pass/vec-growth.rs index c9a4c57cc9d..e51d898e1d4 100644 --- a/src/test/run-pass/vec-growth.rs +++ b/src/test/run-pass/vec-growth.rs @@ -11,7 +11,7 @@ pub fn main() { - let mut v = ~[1]; + let mut v = vec!(1); v.push(2); v.push(3); v.push(4); diff --git a/src/test/run-pass/vec-ivec-deadlock.rs b/src/test/run-pass/vec-ivec-deadlock.rs index ccc7768469d..fc9ab277aa1 100644 --- a/src/test/run-pass/vec-ivec-deadlock.rs +++ b/src/test/run-pass/vec-ivec-deadlock.rs @@ -11,7 +11,7 @@ #[allow(dead_assignment)]; pub fn main() { - let a = ~[1, 2, 3, 4, 5]; - let mut b = ~[a.clone(), a.clone()]; + let a = vec!(1, 2, 3, 4, 5); + let mut b = vec!(a.clone(), a.clone()); b = b + b; // FIXME(#3387)---can't write b += b } diff --git a/src/test/run-pass/vec-late-init.rs b/src/test/run-pass/vec-late-init.rs index c15a7fcdf29..7239ae8a1d6 100644 --- a/src/test/run-pass/vec-late-init.rs +++ b/src/test/run-pass/vec-late-init.rs @@ -11,7 +11,7 @@ pub fn main() { - let mut later: ~[int]; - if true { later = ~[1]; } else { later = ~[2]; } + let mut later: Vec ; + if true { later = vec!(1); } else { later = vec!(2); } println!("{}", later[0]); } diff --git a/src/test/run-pass/vec-push.rs b/src/test/run-pass/vec-push.rs index 50e76db0314..33f01c5bd41 100644 --- a/src/test/run-pass/vec-push.rs +++ b/src/test/run-pass/vec-push.rs @@ -8,4 +8,4 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub fn main() { let mut v = ~[1, 2, 3]; v.push(1); } +pub fn main() { let mut v = vec!(1, 2, 3); v.push(1); } diff --git a/src/test/run-pass/vec-self-append.rs b/src/test/run-pass/vec-self-append.rs index cd20917a179..222ab898931 100644 --- a/src/test/run-pass/vec-self-append.rs +++ b/src/test/run-pass/vec-self-append.rs @@ -10,7 +10,7 @@ fn test_heap_to_heap() { // a spills onto the heap - let mut a = ~[0, 1, 2, 3, 4]; + let mut a = vec!(0, 1, 2, 3, 4); a = a + a; // FIXME(#3387)---can't write a += a assert_eq!(a.len(), 10u); assert_eq!(a[0], 0); @@ -27,7 +27,7 @@ fn test_heap_to_heap() { fn test_stack_to_heap() { // a is entirely on the stack - let mut a = ~[0, 1, 2]; + let mut a = vec!(0, 1, 2); // a spills to the heap a = a + a; // FIXME(#3387)---can't write a += a assert_eq!(a.len(), 6u); @@ -41,7 +41,7 @@ fn test_stack_to_heap() { fn test_loop() { // Make sure we properly handle repeated self-appends. - let mut a: ~[int] = ~[0]; + let mut a: Vec = vec!(0); let mut i = 20; let mut expected_len = 1u; while i > 0 { diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs index e3012b08621..946b6a469da 100644 --- a/src/test/run-pass/vec-slice.rs +++ b/src/test/run-pass/vec-slice.rs @@ -9,7 +9,7 @@ // except according to those terms. pub fn main() { - let v = ~[1,2,3,4,5]; + let v = vec!(1,2,3,4,5); let v2 = v.slice(1, 3); assert_eq!(v2[0], 2); assert_eq!(v2[1], 3); diff --git a/src/test/run-pass/vec-to_str.rs b/src/test/run-pass/vec-to_str.rs index e25b4de0a11..64072dab3e3 100644 --- a/src/test/run-pass/vec-to_str.rs +++ b/src/test/run-pass/vec-to_str.rs @@ -9,10 +9,10 @@ // except according to those terms. pub fn main() { - assert_eq!((~[0, 1]).to_str(), ~"[0, 1]"); + assert_eq!((vec!(0, 1)).to_str(), ~"[0, 1]"); assert_eq!((&[1, 2]).to_str(), ~"[1, 2]"); - let foo = ~[3, 4]; + let foo = vec!(3, 4); let bar = &[4, 5]; assert_eq!(foo.to_str(), ~"[3, 4]"); diff --git a/src/test/run-pass/vec-trailing-comma.rs b/src/test/run-pass/vec-trailing-comma.rs index 426416f63d3..683161178f2 100644 --- a/src/test/run-pass/vec-trailing-comma.rs +++ b/src/test/run-pass/vec-trailing-comma.rs @@ -11,10 +11,10 @@ // Issue #2482. pub fn main() { - let v1: ~[int] = ~[10, 20, 30,]; - let v2: ~[int] = ~[10, 20, 30]; + let v1: Vec = vec!(10, 20, 30); + let v2: Vec = vec!(10, 20, 30); assert_eq!(v1[2], v2[2]); - let v3: ~[int] = ~[10,]; - let v4: ~[int] = ~[10]; + let v3: Vec = vec!(10); + let v4: Vec = vec!(10); assert_eq!(v3[0], v4[0]); } diff --git a/src/test/run-pass/vec.rs b/src/test/run-pass/vec.rs index cb67546dc1b..06869bcb76e 100644 --- a/src/test/run-pass/vec.rs +++ b/src/test/run-pass/vec.rs @@ -12,7 +12,7 @@ pub fn main() { - let v: ~[int] = ~[10, 20]; + let v: Vec = vec!(10, 20); assert_eq!(v[0], 10); assert_eq!(v[1], 20); let mut x: int = 0; diff --git a/src/test/run-pass/vector-no-ann-2.rs b/src/test/run-pass/vector-no-ann-2.rs index a2a8c8d2b34..72e1676bccb 100644 --- a/src/test/run-pass/vector-no-ann-2.rs +++ b/src/test/run-pass/vector-no-ann-2.rs @@ -10,4 +10,4 @@ #[feature(managed_boxes)]; -pub fn main() { let _quux: @~[uint] = @~[]; } +pub fn main() { let _quux: @Vec = @Vec::new(); } diff --git a/src/test/run-pass/while-with-break.rs b/src/test/run-pass/while-with-break.rs index 1f16b5fdb5c..a7328267541 100644 --- a/src/test/run-pass/while-with-break.rs +++ b/src/test/run-pass/while-with-break.rs @@ -15,8 +15,8 @@ pub fn main() { println!("{}", i); i = i + 1; if i == 95 { - let _v: ~[int] = - ~[1, 2, 3, 4, 5]; // we check that it is freed by break + let _v: Vec = + vec!(1, 2, 3, 4, 5); // we check that it is freed by break println!("breaking"); break; -- 2.44.0