rustc: Remove uses of DVec

Author: alexcrichton

src/librustc/metadata/csearch.rs

@@ -19,7 +19,6 @@ use metadata::decoder;
 use metadata;
 use middle::{ty, resolve};
 
-use core::dvec::DVec;
 use core::vec;
 use reader = std::ebml::reader;
 use syntax::ast;
@@ -136,7 +135,7 @@ pub fn get_supertraits(tcx: ty::ctxt, def: ast::def_id) -> ~[ty::t] {
 
 pub fn get_method_names_if_trait(cstore: @mut cstore::CStore,
                                  def: ast::def_id)
-                              -> Option<@DVec<(ast::ident, ast::self_ty_)>> {
+                              -> Option<~[(ast::ident, ast::self_ty_)]> {
     let cdata = cstore::get_crate_data(cstore, def.crate);
     return decoder::get_method_names_if_trait(cstore.intr, cdata, def.node);
 }

src/librustc/metadata/decoder.rs

@@ -22,8 +22,6 @@ use metadata::decoder;
 use metadata::tydecode::{parse_ty_data, parse_def_id, parse_bounds_data};
 use middle::{ty, resolve};
 
-use core::dvec;
-use core::dvec::DVec;
 use core::hash::{Hash, HashUtil};
 use core::int;
 use core::io::WriterUtil;
@@ -766,27 +764,27 @@ pub fn get_provided_trait_methods(intr: @ident_interner, cdata: cmd,
 /// Returns the supertraits of the given trait.
 pub fn get_supertraits(cdata: cmd, id: ast::node_id, tcx: ty::ctxt)
                     -> ~[ty::t] {
-    let results = dvec::DVec();
+    let mut results = ~[];
     let item_doc = lookup_item(id, cdata.data);
     for reader::tagged_docs(item_doc, tag_impl_trait) |trait_doc| {
         results.push(doc_type(trait_doc, tcx, cdata));
     }
-    return dvec::unwrap(results);
+    return results;
 }
 
 // If the item in question is a trait, returns its set of methods and
 // their self types. Otherwise, returns none. This overlaps in an
 // annoying way with get_trait_methods.
 pub fn get_method_names_if_trait(intr: @ident_interner, cdata: cmd,
                                  node_id: ast::node_id)
-                              -> Option<@DVec<(ast::ident, ast::self_ty_)>> {
+                              -> Option<~[(ast::ident, ast::self_ty_)]> {
 
     let item = lookup_item(node_id, cdata.data);
     if item_family(item) != Trait {
         return None;
     }
 
-    let resulting_methods = @DVec();
+    let mut resulting_methods = ~[];
     for reader::tagged_docs(item, tag_item_trait_method) |method| {
         resulting_methods.push(
             (item_name(intr, method), get_self_ty(method)));
@@ -823,12 +821,12 @@ pub fn get_static_methods_if_impl(intr: @ident_interner,
         return None;
     }
 
-    let impl_method_ids = DVec();
+    let mut impl_method_ids = ~[];
     for reader::tagged_docs(item, tag_item_impl_method) |impl_method_doc| {
         impl_method_ids.push(parse_def_id(reader::doc_data(impl_method_doc)));
     }
 
-    let static_impl_methods = DVec();
+    let mut static_impl_methods = ~[];
     for impl_method_ids.each |impl_method_id| {
         let impl_method_doc = lookup_item(impl_method_id.node, cdata.data);
         let family = item_family(impl_method_doc);
@@ -852,7 +850,7 @@ pub fn get_static_methods_if_impl(intr: @ident_interner,
         }
     }
 
-    return Some(dvec::unwrap(static_impl_methods));
+    return Some(static_impl_methods);
 }
 
 pub fn get_item_attrs(cdata: cmd,

src/librustc/metadata/encoder.rs

@@ -22,7 +22,6 @@ use middle::ty;
 use middle;
 use util::ppaux::ty_to_str;
 
-use core::dvec;
 use core::flate;
 use core::hash::{Hash, HashUtil};
 use core::int;
@@ -857,7 +856,7 @@ fn encode_info_for_item(ecx: @EncodeContext, ebml_w: writer::Encoder,
         }
       }
       item_trait(ref generics, ref traits, ref ms) => {
-        let provided_methods = dvec::DVec();
+        let mut provided_methods = ~[];
 
         add_to_index();
         ebml_w.start_tag(tag_items_data_item);
@@ -1366,13 +1365,11 @@ pub fn encode_metadata(parms: EncodeParams, crate: &crate) -> ~[u8] {
 
     if (parms.tcx.sess.meta_stats()) {
 
-        do wr.bytes.borrow |v| {
-            do v.each |e| {
-                if *e == 0 {
-                    ecx.stats.zero_bytes += 1;
-                }
-                true
+        do wr.bytes.each |e| {
+            if *e == 0 {
+                ecx.stats.zero_bytes += 1;
             }
+            true
         }
 
         io::println("metadata stats:");
@@ -1401,7 +1398,7 @@ pub fn encode_metadata(parms: EncodeParams, crate: &crate) -> ~[u8] {
 
     (do str::as_bytes(&~"rust\x00\x00\x00\x01") |bytes| {
         vec::slice(*bytes, 0, 8).to_vec()
-    }) + flate::deflate_bytes(wr.bytes.check_out(|buf| buf))
+    }) + flate::deflate_bytes(wr.bytes)
 }
 
 // Get the encoded string for a type

src/librustc/middle/astencode.rs

@@ -25,7 +25,7 @@ use middle::{ty, typeck, moves};
 use middle;
 use util::ppaux::ty_to_str;
 
-use core::{dvec, io, option, vec};
+use core::{io, option, vec};
 use std::ebml::reader;
 use std::ebml;
 use std::serialize;
@@ -912,11 +912,11 @@ fn encode_side_tables_for_id(ecx: @e::EncodeContext,
         }
     }
 
-    for maps.last_use_map.find(&id).each |m| {
+    for maps.last_use_map.find(&id).each |&m| {
         do ebml_w.tag(c::tag_table_last_use) {
             ebml_w.id(id);
             do ebml_w.tag(c::tag_table_val) {
-                do ebml_w.emit_from_vec((*m).get()) |id| {
+                do ebml_w.emit_from_vec(/*bad*/ copy *m) |id| {
                     id.encode(&ebml_w);
                 }
             }
@@ -1131,8 +1131,7 @@ fn decode_side_tables(xcx: @ExtendedDecodeContext,
                 let ids = val_dsr.read_to_vec(|| {
                     xcx.tr_id(val_dsr.read_int())
                 });
-                let dvec = @dvec::from_vec(ids);
-                dcx.maps.last_use_map.insert(id, dvec);
+                dcx.maps.last_use_map.insert(id, @mut ids);
             } else if tag == (c::tag_table_method_map as uint) {
                 dcx.maps.method_map.insert(
                     id,

src/librustc/middle/borrowck/gather_loans.rs

@@ -32,7 +32,6 @@ use middle::ty;
 use util::common::indenter;
 use util::ppaux::{expr_repr, region_to_str};
 
-use core::dvec;
 use core::hashmap::linear::LinearSet;
 use core::vec;
 use std::oldmap::HashMap;
@@ -575,9 +574,8 @@ pub impl GatherLoanCtxt {
                 req_loans.push_all(loans);
             }
             None => {
-                let dvec = @dvec::from_vec(loans);
                 let req_loan_map = self.req_maps.req_loan_map;
-                req_loan_map.insert(scope_id, dvec);
+                req_loan_map.insert(scope_id, @mut loans);
             }
         }
     }

src/librustc/middle/borrowck/mod.rs

@@ -234,7 +234,6 @@ use middle::moves;
 use util::common::{indenter, stmt_set};
 use util::ppaux::note_and_explain_region;
 
-use core::dvec::DVec;
 use core::io;
 use core::result::{Result, Ok, Err};
 use core::to_bytes;
@@ -406,7 +405,7 @@ pub struct Loan {
 /// - `pure_map`: map from block/expr that must be pure to the error message
 ///   that should be reported if they are not pure
 pub struct ReqMaps {
-    req_loan_map: HashMap<ast::node_id, @DVec<Loan>>,
+    req_loan_map: HashMap<ast::node_id, @mut ~[Loan]>,
     pure_map: HashMap<ast::node_id, bckerr>
 }
 

src/librustc/middle/liveness.rs

@@ -112,7 +112,6 @@ use middle::moves;
 use util::ppaux::ty_to_str;
 
 use core::cmp;
-use core::dvec::DVec;
 use core::io::WriterUtil;
 use core::io;
 use core::ptr;
@@ -136,7 +135,7 @@ use syntax::{visit, ast_util};
 //
 // Very subtle (#2633): borrowck will remove entries from this table
 // if it detects an outstanding loan (that is, the addr is taken).
-pub type last_use_map = HashMap<node_id, @DVec<node_id>>;
+pub type last_use_map = HashMap<node_id, @mut ~[node_id]>;
 
 enum Variable = uint;
 enum LiveNode = uint;
@@ -419,13 +418,13 @@ pub impl IrMaps {
             let v = match self.last_use_map.find(&expr_id) {
               Some(v) => v,
               None => {
-                let v = @DVec();
+                let v = @mut ~[];
                 self.last_use_map.insert(expr_id, v);
                 v
               }
             };
 
-            (*v).push(id);
+            v.push(id);
           }
           Arg(_, _, by_ref) |
           Arg(_, _, by_val) | ImplicitRet => {
@@ -667,7 +666,7 @@ struct Liveness {
     users: @mut ~[Users],
     // The list of node IDs for the nested loop scopes
     // we're in.
-    loop_scope: DVec<node_id>,
+    loop_scope: @mut ~[node_id],
     // mappings from loop node ID to LiveNode
     // ("break" label should map to loop node ID,
     // it probably doesn't now)
@@ -683,7 +682,7 @@ fn Liveness(ir: @mut IrMaps, specials: Specials) -> Liveness {
         successors: @mut vec::from_elem(ir.num_live_nodes, invalid_node()),
         users: @mut vec::from_elem(ir.num_live_nodes * ir.num_vars,
                                    invalid_users()),
-        loop_scope: DVec(),
+        loop_scope: @mut ~[],
         break_ln: HashMap(),
         cont_ln: HashMap()
     }
@@ -856,11 +855,16 @@ pub impl Liveness {
                     self.tcx.sess.span_bug(sp, ~"break outside loop");
                 }
                 else {
-                    self.loop_scope.last()
+                    // FIXME(#5275): this shouldn't have to be a method...
+                    self.last_loop_scope()
                 }
         }
     }
 
+    fn last_loop_scope(&self) -> node_id {
+        *self.loop_scope.last()
+    }
+
     fn ln_str(&self, ln: LiveNode) -> ~str {
         do io::with_str_writer |wr| {
             wr.write_str(~"[ln(");

src/librustc/middle/privacy.rs

@@ -21,7 +21,6 @@ use middle::typeck::{method_map, method_origin, method_param, method_self};
 use middle::typeck::{method_super};
 use middle::typeck::{method_static, method_trait};
 
-use core::dvec::DVec;
 use core::util::ignore;
 use syntax::ast::{def_variant, expr_field, expr_method_call, expr_struct};
 use syntax::ast::{expr_unary, ident, item_struct, item_enum, item_impl};
@@ -38,7 +37,7 @@ use syntax::visit;
 pub fn check_crate(tcx: ty::ctxt,
                    method_map: &method_map,
                    crate: @ast::crate) {
-    let privileged_items = @DVec();
+    let privileged_items = @mut ~[];
 
     // Adds structs that are privileged to this scope.
     let add_privileged_items: @fn(&[@ast::item]) -> uint = |items| {

src/librustc/middle/region.rs

@@ -26,7 +26,6 @@ use middle::ty::{region_variance, rv_covariant, rv_invariant};
 use middle::ty::{rv_contravariant};
 use middle::ty;
 
-use core::dvec::DVec;
 use core::vec;
 use std::oldmap::HashMap;
 use syntax::ast_map;
@@ -395,7 +394,7 @@ pub struct region_dep {
     id: ast::node_id
 }
 
-pub type dep_map = HashMap<ast::node_id, @DVec<region_dep>>;
+pub type dep_map = HashMap<ast::node_id, @mut ~[region_dep]>;
 
 pub struct DetermineRpCtxt {
     sess: Session,
@@ -498,7 +497,7 @@ pub impl DetermineRpCtxt {
         let vec = match self.dep_map.find(&from) {
             Some(vec) => vec,
             None => {
-                let vec = @DVec();
+                let vec = @mut ~[];
                 let dep_map = self.dep_map;
                 dep_map.insert(from, vec);
                 vec