Convert more core types to camel case

20 files changed, 64 insertions, 64 deletions

diff --git a/src/rustc/front/test.rs b/src/rustc/front/test.rs
index 2f892c9ba9d..90de6a4335f 100644
--- a/src/rustc/front/test.rs
+++ b/src/rustc/front/test.rs
@@ -9,7 +9,7 @@ import syntax::codemap::span;
 import driver::session;
 import session::session;
 import syntax::attr;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 export modify_for_testing;
 
@@ -22,7 +22,7 @@ type test_ctxt =
     @{sess: session::session,
       crate: @ast::crate,
       mut path: ~[ast::ident],
-      testfns: dvec<test>};
+      testfns: DVec<test>};
 
 // Traverse the crate, collecting all the test functions, eliding any
 // existing main functions, and synthesizing a main test harness
diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs
index 13c85d02b73..744ee50da8b 100644
--- a/src/rustc/metadata/creader.rs
+++ b/src/rustc/metadata/creader.rs
@@ -9,7 +9,7 @@ import std::map::{hashmap, int_hash};
 import syntax::print::pprust;
 import filesearch::filesearch;
 import common::*;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 export read_crates;
 
@@ -42,7 +42,7 @@ type cache_entry = {
     metas: @~[@ast::meta_item]
 };
 
-fn dump_crates(crate_cache: dvec<cache_entry>) {
+fn dump_crates(crate_cache: DVec<cache_entry>) {
     debug!{"resolved crates:"};
     for crate_cache.each |entry| {
         debug!{"cnum: %?", entry.cnum};
@@ -67,9 +67,9 @@ fn warn_if_multiple_versions(diag: span_handler,
             partition(crate_cache.map_to_vec(|entry| {
                 let othername = loader::crate_name_from_metas(*entry.metas);
                 if name == othername {
-                    left(entry)
+                    Left(entry)
                 } else {
-                    right(entry)
+                    Right(entry)
                 }
             }));
 
@@ -96,7 +96,7 @@ type env = @{diag: span_handler,
              cstore: cstore::cstore,
              os: loader::os,
              static: bool,
-             crate_cache: dvec<cache_entry>,
+             crate_cache: DVec<cache_entry>,
              mut next_crate_num: ast::crate_num};
 
 fn visit_view_item(e: env, i: @ast::view_item) {
@@ -114,11 +114,11 @@ fn visit_item(e: env, i: @ast::item) {
     match i.node {
       ast::item_foreign_mod(m) => {
         match attr::foreign_abi(i.attrs) {
-          either::right(abi) => {
+          either::Right(abi) => {
             if abi != ast::foreign_abi_cdecl &&
                abi != ast::foreign_abi_stdcall { return; }
           }
-          either::left(msg) => e.diag.span_fatal(i.span, msg)
+          either::Left(msg) => e.diag.span_fatal(i.span, msg)
         }
 
         let cstore = e.cstore;
diff --git a/src/rustc/metadata/csearch.rs b/src/rustc/metadata/csearch.rs
index 985cdd9c2d1..69c76e40417 100644
--- a/src/rustc/metadata/csearch.rs
+++ b/src/rustc/metadata/csearch.rs
@@ -10,7 +10,7 @@ import syntax::diagnostic::span_handler;
 import syntax::diagnostic::expect;
 import common::*;
 import std::map::hashmap;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 export class_dtor;
 export get_symbol;
@@ -144,7 +144,7 @@ fn get_trait_methods(tcx: ty::ctxt, def: ast::def_id) -> @~[ty::method] {
 }
 
 fn get_method_names_if_trait(cstore: cstore::cstore, def: ast::def_id)
-    -> option<@dvec<(@~str, ast::self_ty_)>> {
+    -> option<@DVec<(@~str, ast::self_ty_)>> {
 
     let cdata = cstore::get_crate_data(cstore, def.crate);
     return decoder::get_method_names_if_trait(cdata, def.node);
diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
index d6d9b2701e4..70754ccdd82 100644
--- a/src/rustc/metadata/decoder.rs
+++ b/src/rustc/metadata/decoder.rs
@@ -2,8 +2,8 @@
 
 import std::{ebml, map};
 import std::map::{hashmap, str_hash};
-import dvec::dvec;
 import io::WriterUtil;
+import dvec::{DVec, dvec};
 import syntax::{ast, ast_util};
 import syntax::attr;
 import middle::ty;
@@ -684,7 +684,7 @@ fn get_trait_methods(cdata: cmd, id: ast::node_id, tcx: ty::ctxt)
 // their self types. Otherwise, returns none. This overlaps in an
 // annoying way with get_trait_methods.
 fn get_method_names_if_trait(cdata: cmd, node_id: ast::node_id)
-                          -> option<@dvec<(@~str, ast::self_ty_)>> {
+                          -> option<@DVec<(@~str, ast::self_ty_)>> {
 
     let item = lookup_item(node_id, cdata.data);
     if item_family(item) != 'I' {
diff --git a/src/rustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs
index 61caf4a2509..83b8666f7c4 100644
--- a/src/rustc/middle/borrowck.rs
+++ b/src/rustc/middle/borrowck.rs
@@ -229,7 +229,7 @@ import syntax::print::pprust;
 import util::common::indenter;
 import ty::to_str;
 import driver::session::session;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 import mem_categorization::*;
 
 export check_crate, root_map, mutbl_map;
@@ -339,7 +339,7 @@ type loan = {lp: @loan_path, cmt: cmt, mutbl: ast::mutability};
 /// - `pure_map`: map from block/expr that must be pure to the error message
 ///   that should be reported if they are not pure
 type req_maps = {
-    req_loan_map: hashmap<ast::node_id, @dvec<@dvec<loan>>>,
+    req_loan_map: hashmap<ast::node_id, @DVec<@DVec<loan>>>,
     pure_map: hashmap<ast::node_id, bckerr>
 };
 
diff --git a/src/rustc/middle/borrowck/gather_loans.rs b/src/rustc/middle/borrowck/gather_loans.rs
index bcf36b4cb1a..3541ddad626 100644
--- a/src/rustc/middle/borrowck/gather_loans.rs
+++ b/src/rustc/middle/borrowck/gather_loans.rs
@@ -393,7 +393,7 @@ impl gather_loan_ctxt {
         }
     }
 
-    fn add_loans(scope_id: ast::node_id, loans: @dvec<loan>) {
+    fn add_loans(scope_id: ast::node_id, loans: @DVec<loan>) {
         match self.req_maps.req_loan_map.find(scope_id) {
           some(l) => {
             (*l).push(loans);
diff --git a/src/rustc/middle/borrowck/loan.rs b/src/rustc/middle/borrowck/loan.rs
index ea917ec60d2..66b786ca791 100644
--- a/src/rustc/middle/borrowck/loan.rs
+++ b/src/rustc/middle/borrowck/loan.rs
@@ -8,7 +8,7 @@ import result::{result, ok, err};
 impl borrowck_ctxt {
     fn loan(cmt: cmt,
             scope_region: ty::region,
-            mutbl: ast::mutability) -> bckres<@dvec<loan>> {
+            mutbl: ast::mutability) -> bckres<@DVec<loan>> {
         let lc = loan_ctxt_(@{bccx: self,
                               scope_region: scope_region,
                               loans: @dvec()});
@@ -26,7 +26,7 @@ type loan_ctxt_ = {
     scope_region: ty::region,
 
     // accumulated list of loans that will be required
-    loans: @dvec<loan>
+    loans: @DVec<loan>
 };
 
 enum loan_ctxt {
diff --git a/src/rustc/middle/check_const.rs b/src/rustc/middle/check_const.rs
index 545cc049f48..3dc016e021d 100644
--- a/src/rustc/middle/check_const.rs
+++ b/src/rustc/middle/check_const.rs
@@ -2,7 +2,7 @@ import syntax::ast::*;
 import syntax::{visit, ast_util, ast_map};
 import driver::session::session;
 import std::map::hashmap;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 fn check_crate(sess: session, crate: @crate, ast_map: ast_map::map,
                def_map: resolve3::DefMap,
@@ -150,7 +150,7 @@ fn check_item_recursion(sess: session, ast_map: ast_map::map,
         sess: session,
         ast_map: ast_map::map,
         def_map: resolve3::DefMap,
-        idstack: @dvec<node_id>,
+        idstack: @DVec<node_id>,
     };
 
     let env = {
diff --git a/src/rustc/middle/lint.rs b/src/rustc/middle/lint.rs
index ca4a5866a0a..31bb20a47d0 100644
--- a/src/rustc/middle/lint.rs
+++ b/src/rustc/middle/lint.rs
@@ -415,7 +415,7 @@ fn check_item_ctypes(cx: ty::ctxt, it: @ast::item) {
 
     match it.node {
       ast::item_foreign_mod(nmod) if attr::foreign_abi(it.attrs) !=
-      either::right(ast::foreign_abi_rust_intrinsic) => {
+      either::Right(ast::foreign_abi_rust_intrinsic) => {
         for nmod.items.each |ni| {
             match ni.node {
               ast::foreign_item_fn(decl, tps) => {
diff --git a/src/rustc/middle/liveness.rs b/src/rustc/middle/liveness.rs
index 61feb22f1b4..f8983f2bebb 100644
--- a/src/rustc/middle/liveness.rs
+++ b/src/rustc/middle/liveness.rs
@@ -100,7 +100,7 @@
  * - `self_var`: a variable representing 'self'
  */
 
-import dvec::dvec;
+import dvec::{DVec, dvec};
 import std::map::{hashmap, int_hash, str_hash, box_str_hash};
 import syntax::{visit, ast_util};
 import syntax::print::pprust::{expr_to_str};
@@ -122,7 +122,7 @@ export last_use_map;
 //
 // Very subtle (#2633): borrowck will remove entries from this table
 // if it detects an outstanding loan (that is, the addr is taken).
-type last_use_map = hashmap<node_id, @dvec<node_id>>;
+type last_use_map = hashmap<node_id, @DVec<node_id>>;
 
 enum variable = uint;
 enum live_node = uint;
diff --git a/src/rustc/middle/region.rs b/src/rustc/middle/region.rs
index c4ab394aca0..e226e0ef9c5 100644
--- a/src/rustc/middle/region.rs
+++ b/src/rustc/middle/region.rs
@@ -14,7 +14,7 @@ import syntax::codemap::span;
 import syntax::print::pprust;
 import syntax::ast_util::new_def_hash;
 import syntax::ast_map;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 import metadata::csearch;
 
 import std::list;
@@ -343,7 +343,7 @@ fn resolve_crate(sess: session, def_map: resolve3::DefMap,
 // dependencies until a fixed point is reached.
 
 type region_paramd_items = hashmap<ast::node_id, ()>;
-type dep_map = hashmap<ast::node_id, @dvec<ast::node_id>>;
+type dep_map = hashmap<ast::node_id, @DVec<ast::node_id>>;
 
 type determine_rp_ctxt_ = {
     sess: session,
@@ -351,7 +351,7 @@ type determine_rp_ctxt_ = {
     def_map: resolve3::DefMap,
     region_paramd_items: region_paramd_items,
     dep_map: dep_map,
-    worklist: dvec<ast::node_id>,
+    worklist: DVec<ast::node_id>,
 
     // the innermost enclosing item id
     mut item_id: ast::node_id,
diff --git a/src/rustc/middle/resolve3.rs b/src/rustc/middle/resolve3.rs
index 6212b79e1e5..a06e6ea1dba 100644
--- a/src/rustc/middle/resolve3.rs
+++ b/src/rustc/middle/resolve3.rs
@@ -52,7 +52,7 @@ import syntax::visit::{visit_foreign_item, visit_item, visit_method_helper};
 import syntax::visit::{visit_mod, visit_ty, vt};
 
 import box::ptr_eq;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 import option::{get, is_some};
 import str::{connect, split_str};
 import vec::pop;
@@ -89,7 +89,7 @@ type ImplScopes = @list<ImplScope>;
 type ImplMap = hashmap<node_id,ImplScopes>;
 
 // Trait method resolution
-type TraitMap = @hashmap<node_id,@dvec<def_id>>;
+type TraitMap = @hashmap<node_id,@DVec<def_id>>;
 
 // Export mapping
 type Export = { reexp: bool, id: def_id };
@@ -116,7 +116,7 @@ enum NamespaceResult {
 enum ImplNamespaceResult {
     UnknownImplResult,
     UnboundImplResult,
-    BoundImplResult(@dvec<@Target>)
+    BoundImplResult(@DVec<@Target>)
 }
 
 enum NameDefinition {
@@ -250,7 +250,7 @@ fn Atom(n: uint) -> Atom {
 
 class AtomTable {
     let atoms: hashmap<@~str,Atom>;
-    let strings: dvec<@~str>;
+    let strings: DVec<@~str>;
     let mut atom_count: uint;
 
     new() {
@@ -326,11 +326,11 @@ class Rib {
 
 /// One import directive.
 class ImportDirective {
-    let module_path: @dvec<Atom>;
+    let module_path: @DVec<Atom>;
     let subclass: @ImportDirectiveSubclass;
     let span: span;
 
-    new(module_path: @dvec<Atom>,
+    new(module_path: @DVec<Atom>,
         subclass: @ImportDirectiveSubclass,
         span: span) {
 
@@ -363,7 +363,7 @@ class ImportResolution {
     let mut module_target: option<Target>;
     let mut value_target: option<Target>;
     let mut type_target: option<Target>;
-    let mut impl_target: @dvec<@Target>;
+    let mut impl_target: @DVec<@Target>;
 
     let mut used: bool;
 
@@ -409,7 +409,7 @@ class Module {
     let mut def_id: option<def_id>;
 
     let children: hashmap<Atom,@NameBindings>;
-    let imports: dvec<@ImportDirective>;
+    let imports: DVec<@ImportDirective>;
 
     // The anonymous children of this node. Anonymous children are pseudo-
     // modules that are implicitly created around items contained within
@@ -677,17 +677,17 @@ class Resolver {
     // The current set of local scopes, for values.
     // XXX: Reuse ribs to avoid allocation.
 
-    let value_ribs: @dvec<@Rib>;
+    let value_ribs: @DVec<@Rib>;
 
     // The current set of local scopes, for types.
-    let type_ribs: @dvec<@Rib>;
+    let type_ribs: @DVec<@Rib>;
 
     // Whether the current context is an X-ray context. An X-ray context is
     // allowed to access private names of any module.
     let mut xray_context: XrayFlag;
 
     // The trait that the current context can refer to.
-    let mut current_trait_refs: option<@dvec<def_id>>;
+    let mut current_trait_refs: option<@DVec<def_id>>;
 
     // The atom for the keyword "self".
     let self_atom: Atom;
@@ -1571,7 +1571,7 @@ class Resolver {
 
     /// Creates and adds an import directive to the given module.
     fn build_import_directive(module_: @Module,
-                              module_path: @dvec<Atom>,
+                              module_path: @DVec<Atom>,
                               subclass: @ImportDirectiveSubclass,
                               span: span) {
 
@@ -2181,7 +2181,7 @@ class Resolver {
     }
 
     fn resolve_module_path_from_root(module_: @Module,
-                                     module_path: @dvec<Atom>,
+                                     module_path: @DVec<Atom>,
                                      index: uint,
                                      xray: XrayFlag,
                                      span: span)
@@ -2238,7 +2238,7 @@ class Resolver {
      * the given module.
      */
     fn resolve_module_path_for_import(module_: @Module,
-                                      module_path: @dvec<Atom>,
+                                      module_path: @DVec<Atom>,
                                       xray: XrayFlag,
                                       span: span)
                                    -> ResolveResult<@Module> {
@@ -2932,7 +2932,7 @@ class Resolver {
     // Wraps the given definition in the appropriate number of `def_upvar`
     // wrappers.
 
-    fn upvarify(ribs: @dvec<@Rib>, rib_index: uint, def_like: def_like,
+    fn upvarify(ribs: @DVec<@Rib>, rib_index: uint, def_like: def_like,
                 span: span, allow_capturing_self: AllowCapturingSelfFlag)
              -> option<def_like> {
 
@@ -3031,7 +3031,7 @@ class Resolver {
         return some(dl_def(def));
     }
 
-    fn search_ribs(ribs: @dvec<@Rib>, name: Atom, span: span,
+    fn search_ribs(ribs: @DVec<@Rib>, name: Atom, span: span,
                    allow_capturing_self: AllowCapturingSelfFlag)
                 -> option<def_like> {
 
@@ -4150,7 +4150,7 @@ class Resolver {
         }
     }
 
-    fn intern_module_part_of_path(path: @path) -> @dvec<Atom> {
+    fn intern_module_part_of_path(path: @path) -> @DVec<Atom> {
         let module_path_atoms = @dvec();
         for path.idents.eachi |index, ident| {
             if index == path.idents.len() - 1u {
@@ -4508,7 +4508,7 @@ class Resolver {
         }
     }
 
-    fn search_for_traits_containing_method(name: Atom) -> @dvec<def_id> {
+    fn search_for_traits_containing_method(name: Atom) -> @DVec<def_id> {
         let found_traits = @dvec();
         let mut search_module = self.current_module;
         loop {
@@ -4577,7 +4577,7 @@ class Resolver {
         return found_traits;
     }
 
-    fn add_trait_info_if_containing_method(found_traits: @dvec<def_id>,
+    fn add_trait_info_if_containing_method(found_traits: @DVec<def_id>,
                                            trait_def_id: def_id,
                                            name: Atom) {
 
diff --git a/src/rustc/middle/trans/alt.rs b/src/rustc/middle/trans/alt.rs
index eaf1011f181..e12070e265d 100644
--- a/src/rustc/middle/trans/alt.rs
+++ b/src/rustc/middle/trans/alt.rs
@@ -13,7 +13,7 @@ import syntax::print::pprust::pat_to_str;
 import middle::resolve3::DefMap;
 import back::abi;
 import std::map::hashmap;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 import common::*;
 
@@ -277,7 +277,7 @@ fn enter_uniq(bcx: block, dm: DefMap, m: match_, col: uint, val: ValueRef)
 }
 
 fn get_options(ccx: @crate_ctxt, m: match_, col: uint) -> ~[opt] {
-    fn add_to_set(tcx: ty::ctxt, &&set: dvec<opt>, val: opt) {
+    fn add_to_set(tcx: ty::ctxt, &&set: DVec<opt>, val: opt) {
         if set.any(|l| opt_eq(tcx, l, val)) {return;}
         set.push(val);
     }
diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index 7b901ae9739..23f5c69caa1 100644
--- a/src/rustc/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
@@ -5015,8 +5015,8 @@ fn trans_item(ccx: @crate_ctxt, item: ast::item) {
       ast::item_const(_, expr) => consts::trans_const(ccx, expr, item.id),
       ast::item_foreign_mod(foreign_mod) => {
         let abi = match attr::foreign_abi(item.attrs) {
-          either::right(abi_) => abi_,
-          either::left(msg) => ccx.sess.span_fatal(item.span, msg)
+          either::Right(abi_) => abi_,
+          either::Left(msg) => ccx.sess.span_fatal(item.span, msg)
         };
         foreign::trans_foreign_mod(ccx, foreign_mod, abi);
       }
diff --git a/src/rustc/middle/trans/foreign.rs b/src/rustc/middle/trans/foreign.rs
index 6df5a00f21d..fdde26d6718 100644
--- a/src/rustc/middle/trans/foreign.rs
+++ b/src/rustc/middle/trans/foreign.rs
@@ -1168,8 +1168,8 @@ fn abi_of_foreign_fn(ccx: @crate_ctxt, i: @ast::foreign_item)
         ast_map::node_foreign_item(_, abi, _) => abi
       },
       some(_) => match attr::foreign_abi(i.attrs) {
-        either::right(abi) => abi,
-        either::left(msg) => ccx.sess.span_fatal(i.span, msg)
+        either::Right(abi) => abi,
+        either::Left(msg) => ccx.sess.span_fatal(i.span, msg)
       }
     }
 }
diff --git a/src/rustc/middle/trans/shape.rs b/src/rustc/middle/trans/shape.rs
index 68bddb8d151..78eb527b785 100644
--- a/src/rustc/middle/trans/shape.rs
+++ b/src/rustc/middle/trans/shape.rs
@@ -15,7 +15,7 @@ import syntax::ast_util::{dummy_sp, new_def_hash};
 import syntax::util::interner;
 import util::ppaux::ty_to_str;
 import syntax::codemap::span;
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 import std::map::hashmap;
 import option::is_some;
@@ -65,7 +65,7 @@ type ctxt =
     {mut next_tag_id: u16,
      pad: u16,
      tag_id_to_index: hashmap<nominal_id, u16>,
-     tag_order: dvec<enum_data>,
+     tag_order: DVec<enum_data>,
      resources: interner::interner<nominal_id>,
      llshapetablesty: TypeRef,
      llshapetables: ValueRef};
diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs
index 5cb886a36f0..3bc4e578c74 100644
--- a/src/rustc/middle/typeck/check.rs
+++ b/src/rustc/middle/typeck/check.rs
@@ -501,7 +501,7 @@ fn check_item(ccx: @crate_ctxt, it: @ast::item) {
       }
       ast::item_foreign_mod(m) => {
         if syntax::attr::foreign_abi(it.attrs) ==
-            either::right(ast::foreign_abi_rust_intrinsic) {
+            either::Right(ast::foreign_abi_rust_intrinsic) {
             for m.items.each |item| {
                 check_intrinsic_type(ccx, item);
             }
diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs
index c5d3dd765ab..9de5aa98e5f 100644
--- a/src/rustc/middle/typeck/check/method.rs
+++ b/src/rustc/middle/typeck/check/method.rs
@@ -9,7 +9,7 @@ import syntax::ast::{sty_value};
 import syntax::ast_map;
 import syntax::ast_map::node_id_to_str;
 import syntax::ast_util::{dummy_sp, new_def_hash};
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 type candidate = {
     self_ty: ty::t,          // type of a in a.b()
@@ -57,7 +57,7 @@ class lookup {
     let m_name: ast::ident;
     let mut self_ty: ty::t;
     let mut derefs: uint;
-    let candidates: dvec<candidate>;
+    let candidates: DVec<candidate>;
     let candidate_impls: hashmap<def_id, ()>;
     let supplied_tps: ~[ty::t];
     let include_private: bool;
@@ -435,7 +435,7 @@ class lookup {
     }
 
     fn add_inherent_and_extension_candidates(optional_inherent_methods:
-                                                option<@dvec<@Impl>>,
+                                                option<@DVec<@Impl>>,
                                              use_assignability: bool) {
 
         // Add inherent methods.
diff --git a/src/rustc/middle/typeck/coherence.rs b/src/rustc/middle/typeck/coherence.rs
index e54238e6c69..bc6342dbce1 100644
--- a/src/rustc/middle/typeck/coherence.rs
+++ b/src/rustc/middle/typeck/coherence.rs
@@ -30,7 +30,7 @@ import syntax::visit::{mk_simple_visitor, mk_vt, visit_crate, visit_item};
 import syntax::visit::{visit_mod};
 import util::ppaux::ty_to_str;
 
-import dvec::dvec;
+import dvec::{DVec, dvec};
 import result::ok;
 import std::map::{hashmap, int_hash};
 import uint::range;
@@ -121,11 +121,11 @@ fn method_to_MethodInfo(ast_method: @method) -> @MethodInfo {
 class CoherenceInfo {
     // Contains implementations of methods that are inherent to a type.
     // Methods in these implementations don't need to be exported.
-    let inherent_methods: hashmap<def_id,@dvec<@Impl>>;
+    let inherent_methods: hashmap<def_id,@DVec<@Impl>>;
 
     // Contains implementations of methods associated with a trait. For these,
     // the associated trait must be imported at the call site.
-    let extension_methods: hashmap<def_id,@dvec<@Impl>>;
+    let extension_methods: hashmap<def_id,@DVec<@Impl>>;
 
     new() {
         self.inherent_methods = new_def_hash();
@@ -356,7 +356,7 @@ class CoherenceChecker {
     }
 
     fn check_implementation_coherence(_trait_def_id: def_id,
-                                      implementations: @dvec<@Impl>) {
+                                      implementations: @DVec<@Impl>) {
 
         // Unify pairs of polytypes.
         for range(0, implementations.len()) |i| {
@@ -540,7 +540,7 @@ class CoherenceChecker {
         return trait_id;
     }
 
-    fn gather_privileged_types(items: ~[@item]) -> @dvec<def_id> {
+    fn gather_privileged_types(items: ~[@item]) -> @DVec<def_id> {
         let results = @dvec();
         for items.each |item| {
             match item.node {
diff --git a/src/rustc/middle/typeck/infer.rs b/src/rustc/middle/typeck/infer.rs
index cc0ed23ac72..36461b44b75 100644
--- a/src/rustc/middle/typeck/infer.rs
+++ b/src/rustc/middle/typeck/infer.rs
@@ -262,7 +262,7 @@ import driver::session::session;
 import util::common::{indent, indenter};
 import ast::{unsafe_fn, impure_fn, pure_fn, extern_fn};
 import ast::{m_const, m_imm, m_mutbl};
-import dvec::dvec;
+import dvec::{DVec, dvec};
 
 export infer_ctxt;
 export new_infer_ctxt;
@@ -402,7 +402,7 @@ enum infer_ctxt = @{
     ty_var_integral_counter: @mut uint,
     region_var_counter: @mut uint,
 
-    borrowings: dvec<{expr_id: ast::node_id,
+    borrowings: DVec<{expr_id: ast::node_id,
                       span: span,
                       scope: ty::region,
                       mutbl: ast::mutability}>