test: Removing dvec uses

Author: alexcrichton

src/librustc/middle/astencode.rs

@@ -25,7 +25,6 @@ use middle::{ty, typeck, moves};
 use middle;
 use util::ppaux::ty_to_str;
 
-use core::{io, option, vec};
 use std::ebml::reader;
 use std::ebml;
 use std::serialize;
@@ -1210,6 +1209,7 @@ fn mk_ctxt() -> fake_ext_ctxt {
 
 #[cfg(test)]
 fn roundtrip(in_item: Option<@ast::item>) {
+    use core::io;
     use std::prettyprint;
 
     let in_item = in_item.get();

src/test/auxiliary/cci_nested_lib.rs

@@ -10,11 +10,9 @@
 
 #[legacy_modes];
 
-use core::dvec::DVec;
-
 pub struct Entry<A,B> {key: A, value: B}
 
-pub struct alist<A,B> { eq_fn: @fn(A,A) -> bool, data: DVec<Entry<A,B>> }
+pub struct alist<A,B> { eq_fn: @fn(A,A) -> bool, data: @mut ~[Entry<A,B>] }
 
 pub fn alist_add<A:Copy,B:Copy>(lst: alist<A,B>, k: A, v: B) {
     lst.data.push(Entry{key:k, value:v});
@@ -31,12 +29,12 @@ pub fn alist_get<A:Copy,B:Copy>(lst: alist<A,B>, k: A) -> B {
 #[inline]
 pub fn new_int_alist<B:Copy>() -> alist<int, B> {
     fn eq_int(&&a: int, &&b: int) -> bool { a == b }
-    return alist {eq_fn: eq_int, data: DVec()};
+    return alist {eq_fn: eq_int, data: @mut ~[]};
 }
 
 #[inline]
 pub fn new_int_alist_2<B:Copy>() -> alist<int, B> {
     #[inline]
     fn eq_int(&&a: int, &&b: int) -> bool { a == b }
-    return alist {eq_fn: eq_int, data: DVec()};
+    return alist {eq_fn: eq_int, data: @mut ~[]};
 }

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

@@ -13,10 +13,9 @@
 
 extern mod std;
 
-use core::dvec::*;
 use std::oldmap::HashMap;
 
-pub type header_map = HashMap<~str, @DVec<@~str>>;
+pub type header_map = HashMap<~str, @mut ~[@~str]>;
 
 // the unused ty param is necessary so this gets monomorphized
 pub fn request<T:Copy>(req: header_map) {

src/test/bench/core-vec-append.rs

@@ -8,10 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::dvec::DVec;
-
 struct parser {
-    tokens: DVec<int>,
+    tokens: ~[int],
 }
 
 trait parse {
@@ -20,7 +18,7 @@ trait parse {
 
 impl parse for parser {
     fn parse() -> ~[int] {
-        ::core::dvec::unwrap(self.tokens) //~ ERROR moving out of immutable field
+        self.tokens //~ ERROR moving out of immutable field
     }
 }
 

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

@@ -11,7 +11,7 @@
 fn foo() -> int { 22 }
 
 pub fn main() {
-    let x = dvec::DVec::<@fn() -> int>();
+    let x: ~[@fn() -> int] = ~[];
     x.push(foo);
     fail_unless!((x[0])() == 22);
 }

src/test/run-pass/call-closure-from-overloaded-op.rs

@@ -21,6 +21,6 @@ use std::oldmap::HashMap;
 pub fn main() {
   let v = ~[@~"hi"];
   let m: req::header_map = HashMap();
-  m.insert(~"METHOD", @dvec::from_vec(v));
+  m.insert(~"METHOD", @mut ~[v]);
   request::<int>(m);
 }