Remove outdated and unnecessary std::vec_ng::Vec imports.

(And fix some tests.)

Author: huonw

src/compiletest/compiletest.rs

@@ -21,7 +21,6 @@ extern crate getopts;
 extern crate log;
 
 use std::os;
-use std::vec_ng::Vec;
 use std::io;
 use std::io::fs;
 use getopts::{optopt, optflag, reqopt};

src/compiletest/errors.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::io::{BufferedReader, File};
-use std::vec_ng::Vec;
 
 pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 

src/compiletest/header.rs

@@ -12,8 +12,6 @@ use common::config;
 use common;
 use util;
 
-use std::vec_ng::Vec;
-
 pub struct TestProps {
     // Lines that should be expected, in order, on standard out
     error_patterns: Vec<~str> ,

src/compiletest/runtest.rs

@@ -33,8 +33,7 @@ use std::os;
 use std::str;
 use std::task;
 use std::slice;
-use std::vec_ng;
-
+use std::vec;
 use test::MetricMap;
 
 pub fn run(config: config, testfile: ~str) {

src/libarena/lib.rs

@@ -489,7 +489,6 @@ impl<T> Drop for TypedArena<T> {
 mod tests {
     extern crate test;
 
-    use std::vec_ng::Vec;
 
     use self::test::BenchHarness;
     use super::{Arena, TypedArena};

src/libgetopts/lib.rs

@@ -903,7 +903,6 @@ mod tests {
 
     use std::result::{Err, Ok};
     use std::result;
-    use std::vec_ng::Vec;
 
     fn check_fail_type(f: Fail_, ft: FailType) {
         match f {

src/libsync/arc.rs

@@ -583,7 +583,6 @@ mod tests {
     use super::{Arc, RWArc, MutexArc, CowArc};
 
     use std::task;
-    use std::vec_ng::Vec;
 
     #[test]
     fn manually_share_arc() {

src/libsync/sync/mod.rs

@@ -765,7 +765,6 @@ mod tests {
     use std::result;
     use std::task;
     use std::comm::Empty;
-    use std::vec_ng::Vec;
 
     /************************************************************************
      * Semaphore tests

src/libterm/terminfo/parm.rs

@@ -563,7 +563,7 @@ fn format(val: Param, op: FormatOp, flags: Flags) -> Result<Vec<u8> ,~str> {
 mod test {
     use super::{expand,String,Variables,Number};
     use std::result::Ok;
-    use std::vec_ng;
+    use std::vec;
 
     #[test]
     fn test_basic_setabf() {

src/libuuid/lib.rs

@@ -538,7 +538,6 @@ mod test {
                 Version5Sha1};
     use std::str;
     use std::io::MemWriter;
-    use std::vec_ng::Vec;
 
     #[test]
     fn test_nil() {

src/test/auxiliary/anon-extern-mod-cross-crate-1.rs

@@ -12,7 +12,6 @@
 
 use std::libc;
 
-use std::vec_ng::Vec;
 #[link(name="rustrt")]
 extern {
     pub fn rust_get_test_int() -> libc::intptr_t;

src/test/auxiliary/cci_class_6.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 pub mod kitties {
-    use std::vec_ng::Vec;
 
     pub struct cat<U> {
         priv info : Vec<U> ,

src/test/auxiliary/cci_nested_lib.rs

@@ -11,7 +11,6 @@
 #[feature(managed_boxes)];
 
 use std::cell::RefCell;
-use std::vec_ng::Vec;
 
 pub struct Entry<A,B> {
     key: A,

src/test/auxiliary/cci_no_inline_lib.rs

@@ -10,7 +10,6 @@
 
 #[crate_id="cci_no_inline_lib"];
 
-use std::vec_ng::Vec;
 
 // same as cci_iter_lib, more-or-less, but not marked inline
 pub fn iter(v: Vec<uint> , f: |uint|) {

src/test/auxiliary/issue-2631-a.rs

@@ -15,7 +15,6 @@
 extern crate collections;
 
 use std::cell::RefCell;
-use std::vec_ng::Vec;
 use collections::HashMap;
 
 pub type header_map = HashMap<~str, @RefCell<Vec<@~str>>>;

src/test/auxiliary/issue_2723_a.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::vec_ng::Vec;
 
 pub unsafe fn f(xs: Vec<int> ) {
     xs.map(|_x| { unsafe fn q() { fail!(); } });

src/test/bench/core-uint-to-str.rs

@@ -10,7 +10,6 @@
 
 use std::os;
 use std::uint;
-use std::vec_ng::Vec;
 
 fn main() {
     let args = os::args();

src/test/bench/msgsend-pipes-shared.rs

@@ -24,7 +24,6 @@ use std::comm;
 use std::os;
 use std::task;
 use std::uint;
-use std::vec_ng::Vec;
 
 fn move_out<T>(_x: T) {}
 

src/test/bench/msgsend-pipes.rs

@@ -19,7 +19,6 @@ extern crate time;
 use std::os;
 use std::task;
 use std::uint;
-use std::vec_ng::Vec;
 
 fn move_out<T>(_x: T) {}
 

src/test/bench/msgsend-ring-mutex-arcs.rs

@@ -23,7 +23,6 @@ use sync::MutexArc;
 use sync::Future;
 use std::os;
 use std::uint;
-use std::vec_ng::Vec;
 
 // A poor man's pipe.
 type pipe = MutexArc<Vec<uint> >;

src/test/bench/msgsend-ring-rw-arcs.rs

@@ -22,7 +22,6 @@ use sync::RWArc;
 use sync::Future;
 use std::os;
 use std::uint;
-use std::vec_ng::Vec;
 
 // A poor man's pipe.
 type pipe = RWArc<Vec<uint> >;

src/test/bench/shootout-ackermann.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::os;
-use std::vec_ng::Vec;
 
 fn ack(m: int, n: int) -> int {
     if m == 0 {

src/test/bench/shootout-chameneos-redux.rs

@@ -13,7 +13,6 @@
 use std::option;
 use std::os;
 use std::task;
-use std::vec_ng::Vec;
 
 fn print_complements() {
     let all = [Blue, Red, Yellow];

src/test/bench/shootout-fasta.rs

@@ -18,7 +18,6 @@ use std::io;
 use std::io::{BufferedWriter, File};
 use std::cmp::min;
 use std::os;
-use std::vec_ng::Vec;
 
 static LINE_LENGTH: uint = 60;
 static IM: u32 = 139968;

src/test/bench/shootout-fibo.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::os;
-use std::vec_ng::Vec;
 
 fn fib(n: int) -> int {
     if n < 2 {

src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -24,7 +24,7 @@ use std::os;
 use std::io;
 use std::str;
 use std::task;
-use std::slice;
+use std::vec;
 
 fn f64_cmp(x: f64, y: f64) -> Ordering {
     // arbitrarily decide that NaNs are larger than everything.

src/test/bench/shootout-meteor.rs

@@ -12,7 +12,6 @@
 // Utilities.
 //
 
-use std::vec_ng::Vec;
 
 // returns an infinite iterator of repeated applications of f to x,
 // i.e. [x, f(x), f(f(x)), ...], as haskell iterate function.

src/test/bench/shootout-nbody.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::os;
-use std::vec_ng::Vec;
 
 static PI: f64 = 3.141592653589793;
 static SOLAR_MASS: f64 = 4.0 * PI * PI;

src/test/bench/shootout-pfib.rs

@@ -25,7 +25,6 @@ use std::os;
 use std::result::{Ok, Err};
 use std::task;
 use std::uint;
-use std::vec_ng::Vec;
 
 fn fib(n: int) -> int {
     fn pfib(tx: &Sender<int>, n: int) {

src/test/bench/shootout-spectralnorm.rs

@@ -14,7 +14,6 @@ use std::from_str::FromStr;
 use std::iter::count;
 use std::cmp::min;
 use std::os;
-use std::slice::from_elem;
 use sync::RWArc;
 
 fn A(i: uint, j: uint) -> f64 {
@@ -49,7 +48,7 @@ fn mult(v: RWArc<Vec<f64>>,
         spawn(proc() {
             for i in range(chk, min(len, chk + chunk)) {
                 let val = v.read(|v| f(v, i));
-                out.write(|out| out[i] = val);
+                out.write(|out| *out.get_mut(i) = val);
             }
             drop(tx)
         });
@@ -98,15 +97,16 @@ fn main() {
     } else {
         FromStr::from_str(args[1]).unwrap()
     };
-    let u = RWArc::new(from_elem(n, 1.));
-    let v = RWArc::new(from_elem(n, 1.));
-    let tmp = RWArc::new(from_elem(n, 1.));
+    let u = RWArc::new(Vec::from_elem(n, 1.));
+    let v = RWArc::new(Vec::from_elem(n, 1.));
+    let tmp = RWArc::new(Vec::from_elem(n, 1.));
     for _ in range(0, 10) {
         mult_AtAv(u.clone(), v.clone(), tmp.clone());
         mult_AtAv(v.clone(), u.clone(), tmp.clone());
     }
 
     u.read(|u| v.read(|v| {
-        println!("{:.9f}", (dot(*u, *v) / dot(*v, *v)).sqrt());
+        println!("{:.9f}",
+                 (dot(u.as_slice(), v.as_slice()) / dot(v.as_slice(), v.as_slice())).sqrt());
     }))
 }

src/test/bench/std-smallintmap.rs

@@ -16,7 +16,6 @@ extern crate time;
 use collections::SmallIntMap;
 use std::os;
 use std::uint;
-use std::vec_ng::Vec;
 
 fn append_sequential(min: uint, max: uint, map: &mut SmallIntMap<uint>) {
     for i in range(min, max) {

src/test/bench/sudoku.rs

@@ -70,6 +70,7 @@ impl Sudoku {
 
         let mut g = Vec::from_fn(10u, { |_i| vec!(0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8) });
         for line in reader.lines() {
+            let line = line.unwrap();
             let comps: Vec<&str> = line.trim().split(',').collect();
 
             if comps.len() == 3u {

src/test/bench/task-perf-alloc-unwind.rs

@@ -17,8 +17,7 @@ use collections::list::{List, Cons, Nil};
 use time::precise_time_s;
 use std::os;
 use std::task;
-use std::vec_ng::Vec;
-use std::vec_ng;
+use std::vec;
 
 enum UniqueList {
     ULNil, ULCons(~UniqueList)

src/test/bench/task-perf-jargon-metal-smoke.rs

@@ -21,7 +21,6 @@ use std::comm;
 use std::os;
 use std::task;
 use std::uint;
-use std::vec_ng::Vec;
 
 fn child_generation(gens_left: uint, tx: comm::Sender<()>) {
     // This used to be O(n^2) in the number of generations that ever existed.

src/test/bench/task-perf-spawnalot.rs

@@ -11,7 +11,6 @@
 use std::os;
 use std::task;
 use std::uint;
-use std::vec_ng::Vec;
 
 fn f(n: uint) {
     let mut i = 0u;

src/test/compile-fail/access-mode-in-closures.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::vec_ng::Vec;
 
 struct sty(Vec<int> );
 

src/test/compile-fail/ambig_impl_unify.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::vec_ng::Vec;
 
 trait foo {
     fn foo(&self) -> int;

src/test/compile-fail/borrowck-init-op-equal.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::vec_ng::Vec;
 
 fn test() {
     let v: int;

src/test/compile-fail/drop-on-non-struct.rs

@@ -10,7 +10,6 @@
 
 #[feature(managed_boxes)];
 
-use std::vec_ng::Vec;
 
 type Foo = Vec<u8>;
 

src/test/compile-fail/import.rs

@@ -12,7 +12,6 @@
 use zed::bar;
 use zed::baz;
 
-use std::vec_ng::Vec;
 
 mod zed {
     pub fn bar() { println!("bar"); }

src/test/compile-fail/import2.rs

@@ -11,7 +11,6 @@
 use baz::zed::bar;  //~ ERROR unresolved import
 //~^ ERROR failed to resolve import
 
-use std::vec_ng::Vec;
 
 mod baz {}
 mod zed {

src/test/compile-fail/import4.rs

@@ -10,7 +10,6 @@
 
 // error-pattern: import
 
-use std::vec_ng::Vec;
 
 mod a { pub use b::foo; }
 mod b { pub use a::foo; }

src/test/compile-fail/infinite-vec-type-recursion.rs

@@ -10,7 +10,6 @@
 
 // error-pattern: illegal recursive type
 
-use std::vec_ng::Vec;
 
 type x = Vec<x>;
 

src/test/compile-fail/issue-1655.rs

@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:expected `[` but found `~`
+// error-pattern:expected `[` but found `vec`
 mod blade_runner {
-    #vec!(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."
-    ))
+    )]
 }