about summary refs log tree commit diff
path: root/src/rustc
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-08-27 14:22:25 -0700
committerBrian Anderson <banderson@mozilla.com>2012-08-27 17:22:18 -0700
commit161a82e433fbfbc0bd57a4d951ac37656a8a30f6 (patch)
treec59e3d6a32f471299a8fde09506ebf6cff8f44db /src/rustc
parent4ba9fdd3627869f04ee39d6146023df822e0936e (diff)
downloadrust-161a82e433fbfbc0bd57a4d951ac37656a8a30f6.tar.gz
rust-161a82e433fbfbc0bd57a4d951ac37656a8a30f6.zip
Camel case various core constructors
Diffstat (limited to 'src/rustc')
-rw-r--r--src/rustc/driver/rustc.rs4
-rw-r--r--src/rustc/front/test.rs4
-rw-r--r--src/rustc/metadata/creader.rs4
-rw-r--r--src/rustc/metadata/csearch.rs2
-rw-r--r--src/rustc/metadata/decoder.rs4
-rw-r--r--src/rustc/middle/borrowck.rs2
-rw-r--r--src/rustc/middle/borrowck/check_loans.rs2
-rw-r--r--src/rustc/middle/borrowck/loan.rs2
-rw-r--r--src/rustc/middle/check_const.rs4
-rw-r--r--src/rustc/middle/liveness.rs4
-rw-r--r--src/rustc/middle/region.rs6
-rw-r--r--src/rustc/middle/resolve3.rs22
-rw-r--r--src/rustc/middle/trans/alt.rs4
-rw-r--r--src/rustc/middle/trans/shape.rs4
-rw-r--r--src/rustc/middle/typeck/check/method.rs4
-rw-r--r--src/rustc/middle/typeck/coherence.rs8
-rw-r--r--src/rustc/middle/typeck/infer.rs4
-rw-r--r--src/rustc/middle/typeck/infer/region_var_bindings.rs6
18 files changed, 45 insertions, 45 deletions
diff --git a/src/rustc/driver/rustc.rs b/src/rustc/driver/rustc.rs
index 950c8ddb463..927b6b3da2b 100644
--- a/src/rustc/driver/rustc.rs
+++ b/src/rustc/driver/rustc.rs
@@ -217,8 +217,8 @@ fn monitor(+f: fn~(diagnostic::emitter)) {
         done,
     };
 
-    let p = comm::port();
-    let ch = comm::chan(p);
+    let p = comm::Port();
+    let ch = comm::Chan(p);
 
     match do task::try  {
 
diff --git a/src/rustc/front/test.rs b/src/rustc/front/test.rs
index a3d155a84d6..1a6cce37737 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, dvec};
+import dvec::DVec;
 
 export modify_for_testing;
 
@@ -42,7 +42,7 @@ fn generate_test_harness(sess: session::session,
         @{sess: sess,
           crate: crate,
           mut path: ~[],
-          testfns: dvec()};
+          testfns: DVec()};
 
     let precursor =
         @{fold_crate: fold::wrap(|a,b| fold_crate(cx, a, b) ),
diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs
index a0389893b72..4f3df6cac70 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, dvec};
+import dvec::DVec;
 import syntax::parse::token::ident_interner;
 
 export read_crates;
@@ -24,7 +24,7 @@ fn read_crates(diag: span_handler, crate: ast::crate,
               cstore: cstore,
               os: os,
               static: static,
-              crate_cache: dvec(),
+              crate_cache: DVec(),
               mut next_crate_num: 1,
               intr: intr};
     let v =
diff --git a/src/rustc/metadata/csearch.rs b/src/rustc/metadata/csearch.rs
index 77d1f18eac9..2aa36a8e01b 100644
--- a/src/rustc/metadata/csearch.rs
+++ b/src/rustc/metadata/csearch.rs
@@ -11,7 +11,7 @@ import syntax::diagnostic::expect;
 import ast_util::dummy_sp;
 import common::*;
 import std::map::hashmap;
-import dvec::{DVec, dvec};
+import dvec::DVec;
 
 export class_dtor;
 export get_symbol;
diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
index 7dc3006b79c..2fbb7605a0d 100644
--- a/src/rustc/metadata/decoder.rs
+++ b/src/rustc/metadata/decoder.rs
@@ -3,7 +3,7 @@
 import std::{ebml, map};
 import std::map::{hashmap, str_hash};
 import io::WriterUtil;
-import dvec::{DVec, dvec};
+import dvec::DVec;
 import syntax::{ast, ast_util};
 import syntax::attr;
 import middle::ty;
@@ -714,7 +714,7 @@ fn get_method_names_if_trait(intr: ident_interner, cdata: cmd,
         return None;
     }
 
-    let resulting_methods = @dvec();
+    let resulting_methods = @DVec();
     for ebml::tagged_docs(item, tag_item_trait_method) |method| {
         resulting_methods.push(
             (item_name(intr, method), get_self_ty(method)));
diff --git a/src/rustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs
index 47c0c94b333..049e0a4c898 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, dvec};
+import dvec::DVec;
 import mem_categorization::*;
 
 export check_crate, root_map, mutbl_map;
diff --git a/src/rustc/middle/borrowck/check_loans.rs b/src/rustc/middle/borrowck/check_loans.rs
index 481addc93dc..7248a8b235c 100644
--- a/src/rustc/middle/borrowck/check_loans.rs
+++ b/src/rustc/middle/borrowck/check_loans.rs
@@ -7,7 +7,7 @@
 // 3. assignments do not affect things loaned out as immutable
 // 4. moves to dnot affect things loaned out in any way
 
-import dvec::dvec;
+import dvec::DVec;
 
 export check_loans;
 
diff --git a/src/rustc/middle/borrowck/loan.rs b/src/rustc/middle/borrowck/loan.rs
index 0b0ad514be7..e775bc7c50b 100644
--- a/src/rustc/middle/borrowck/loan.rs
+++ b/src/rustc/middle/borrowck/loan.rs
@@ -11,7 +11,7 @@ impl borrowck_ctxt {
             mutbl: ast::mutability) -> bckres<@DVec<loan>> {
         let lc = loan_ctxt_(@{bccx: self,
                               scope_region: scope_region,
-                              loans: @dvec()});
+                              loans: @DVec()});
         match lc.loan(cmt, mutbl) {
           Ok(()) => {Ok(lc.loans)}
           Err(e) => {Err(e)}
diff --git a/src/rustc/middle/check_const.rs b/src/rustc/middle/check_const.rs
index 881716f7fb8..8c50c9461b7 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, dvec};
+import dvec::DVec;
 
 fn check_crate(sess: session, crate: @crate, ast_map: ast_map::map,
                def_map: resolve3::DefMap,
@@ -158,7 +158,7 @@ fn check_item_recursion(sess: session, ast_map: ast_map::map,
         sess: sess,
         ast_map: ast_map,
         def_map: def_map,
-        idstack: @dvec()
+        idstack: @DVec()
     };
 
     let visitor = visit::mk_vt(@{
diff --git a/src/rustc/middle/liveness.rs b/src/rustc/middle/liveness.rs
index bffae2944f7..2e303f6491d 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, dvec};
+import dvec::DVec;
 import std::map::{hashmap, int_hash, str_hash, uint_hash};
 import syntax::{visit, ast_util};
 import syntax::print::pprust::{expr_to_str};
@@ -348,7 +348,7 @@ impl IrMaps {
             let v = match self.last_use_map.find(expr_id) {
               Some(v) => v,
               None => {
-                let v = @dvec();
+                let v = @DVec();
                 self.last_use_map.insert(expr_id, v);
                 v
               }
diff --git a/src/rustc/middle/region.rs b/src/rustc/middle/region.rs
index 42887548c3b..f1d97f7ba6c 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, dvec};
+import dvec::DVec;
 import metadata::csearch;
 import ty::{region_variance, rv_covariant, rv_invariant, rv_contravariant};
 
@@ -468,7 +468,7 @@ impl determine_rp_ctxt {
         let vec = match self.dep_map.find(from) {
             Some(vec) => vec,
             None => {
-                let vec = @dvec();
+                let vec = @DVec();
                 self.dep_map.insert(from, vec);
                 vec
             }
@@ -753,7 +753,7 @@ fn determine_rp_in_crate(sess: session,
                                   def_map: def_map,
                                   region_paramd_items: int_hash(),
                                   dep_map: int_hash(),
-                                  worklist: dvec(),
+                                  worklist: DVec(),
                                   mut item_id: 0,
                                   mut anon_implies_rp: false,
                                   mut ambient_variance: rv_covariant});
diff --git a/src/rustc/middle/resolve3.rs b/src/rustc/middle/resolve3.rs
index eca96816be8..1115e92a9de 100644
--- a/src/rustc/middle/resolve3.rs
+++ b/src/rustc/middle/resolve3.rs
@@ -53,7 +53,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, dvec};
+import dvec::DVec;
 import option::{get, is_some};
 import str::{connect, split_str};
 import vec::pop;
@@ -384,7 +384,7 @@ struct Module {
         self.def_id = def_id;
 
         self.children = atom_hashmap();
-        self.imports = dvec();
+        self.imports = DVec();
 
         self.anonymous_children = int_hash();
 
@@ -654,9 +654,9 @@ struct Resolver {
         self.unresolved_imports = 0u;
 
         self.current_module = (*self.graph_root).get_module();
-        self.value_ribs = @dvec();
-        self.type_ribs = @dvec();
-        self.label_ribs = @dvec();
+        self.value_ribs = @DVec();
+        self.type_ribs = @DVec();
+        self.label_ribs = @DVec();
 
         self.xray_context = NoXray;
         self.current_trait_refs = None;
@@ -1069,7 +1069,7 @@ struct Resolver {
                     // globs and lists, the path is found directly in the AST;
                     // for simple paths we have to munge the path a little.
 
-                    let module_path = @dvec();
+                    let module_path = @DVec();
                     match view_path.node {
                         view_path_simple(_, full_path, _) => {
                             let path_len = full_path.idents.len();
@@ -3304,7 +3304,7 @@ struct Resolver {
             // Resolve the trait reference, if necessary.
             let original_trait_refs = self.current_trait_refs;
             if trait_references.len() >= 1 {
-                let mut new_trait_refs = @dvec();
+                let mut new_trait_refs = @DVec();
                 for trait_references.each |trait_reference| {
                     match self.resolve_path(
                         trait_reference.path, TypeNS, true, visitor) {
@@ -3893,7 +3893,7 @@ struct Resolver {
     }
 
     fn intern_module_part_of_path(path: @path) -> @DVec<Atom> {
-        let module_path_atoms = @dvec();
+        let module_path_atoms = @DVec();
         for path.idents.eachi |index, ident| {
             if index == path.idents.len() - 1u {
                 break;
@@ -4304,7 +4304,7 @@ struct Resolver {
     }
 
     fn search_for_traits_containing_method(name: Atom) -> @DVec<def_id> {
-        let found_traits = @dvec();
+        let found_traits = @DVec();
         let mut search_module = self.current_module;
         loop {
             // Look for the current trait.
@@ -4406,7 +4406,7 @@ struct Resolver {
     }
 
     fn add_fixed_trait_for_expr(expr_id: node_id, +trait_id: Option<def_id>) {
-        let traits = @dvec();
+        let traits = @DVec();
         traits.push(trait_id.get());
         self.trait_map.insert(expr_id, traits);
     }
@@ -4503,7 +4503,7 @@ struct Resolver {
 
     /// A somewhat inefficient routine to print out the name of a module.
     fn module_to_str(module_: @Module) -> ~str {
-        let atoms = dvec();
+        let atoms = DVec();
         let mut current_module = module_;
         loop {
             match current_module.parent_link {
diff --git a/src/rustc/middle/trans/alt.rs b/src/rustc/middle/trans/alt.rs
index 5bd13aaa24a..4a610799fff 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, dvec};
+import dvec::DVec;
 
 import common::*;
 
@@ -282,7 +282,7 @@ fn get_options(ccx: @crate_ctxt, m: match_, col: uint) -> ~[opt] {
         set.push(val);
     }
 
-    let found = dvec();
+    let found = DVec();
     for vec::each(m) |br| {
         let cur = br.pats[col];
         if pat_is_variant(ccx.tcx.def_map, cur) {
diff --git a/src/rustc/middle/trans/shape.rs b/src/rustc/middle/trans/shape.rs
index be430df5d83..2dd5d968cee 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, dvec};
+import dvec::DVec;
 
 import std::map::hashmap;
 import option::is_some;
@@ -192,7 +192,7 @@ fn mk_ctxt(llmod: ModuleRef) -> ctxt {
     return {mut next_tag_id: 0u16,
          pad: 0u16,
          tag_id_to_index: new_nominal_id_hash(),
-         tag_order: dvec(),
+         tag_order: DVec(),
          resources: interner::mk(hash_nominal_id, eq_nominal_id),
          llshapetablesty: llshapetablesty,
          llshapetables: llshapetables};
diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs
index 0283758b749..c232b8cd94b 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, by_ref, by_copy};
 import syntax::ast_map;
 import syntax::ast_map::node_id_to_str;
 import syntax::ast_util::{dummy_sp, new_def_hash};
-import dvec::{DVec, dvec};
+import dvec::DVec;
 
 enum method_lookup_mode {
     subtyping_mode,
@@ -98,7 +98,7 @@ struct lookup {
         self.m_name = m_name;
         self.self_ty = self_ty;
         self.derefs = 0u;
-        self.candidates = dvec();
+        self.candidates = DVec();
         self.candidate_impls = new_def_hash();
         self.supplied_tps = supplied_tps;
         self.include_private = include_private;
diff --git a/src/rustc/middle/typeck/coherence.rs b/src/rustc/middle/typeck/coherence.rs
index dfe6ce77bc1..0c89b0abe11 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, dvec};
+import dvec::DVec;
 import result::Ok;
 import std::map::{hashmap, int_hash};
 import uint::range;
@@ -329,7 +329,7 @@ struct CoherenceChecker {
             .find(base_def_id) {
 
             None => {
-                implementation_list = @dvec();
+                implementation_list = @DVec();
                 self.crate_context.coherence_info.inherent_methods
                     .insert(base_def_id, implementation_list);
             }
@@ -347,7 +347,7 @@ struct CoherenceChecker {
                 .find(trait_id) {
 
             None => {
-                implementation_list = @dvec();
+                implementation_list = @DVec();
                 self.crate_context.coherence_info.extension_methods
                     .insert(trait_id, implementation_list);
             }
@@ -547,7 +547,7 @@ struct CoherenceChecker {
     }
 
     fn gather_privileged_types(items: ~[@item]) -> @DVec<def_id> {
-        let results = @dvec();
+        let results = @DVec();
         for items.each |item| {
             match item.node {
                 item_class(*) | item_enum(*) | item_trait(*) => {
diff --git a/src/rustc/middle/typeck/infer.rs b/src/rustc/middle/typeck/infer.rs
index 774f5a1f4e0..765dbf81da4 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, dvec};
+import dvec::DVec;
 import region_var_bindings::{RegionVarBindings};
 import ast_util::dummy_sp;
 
@@ -376,7 +376,7 @@ fn new_infer_ctxt(tcx: ty::ctxt) -> infer_ctxt {
                  ty_var_counter: @mut 0u,
                  ty_var_integral_counter: @mut 0u,
                  region_var_counter: @mut 0u,
-                 borrowings: dvec()})}
+                 borrowings: DVec()})}
 
 fn mk_sub(cx: infer_ctxt, a_is_expected: bool, span: span) -> Sub {
     Sub(combine_fields {infcx: cx, a_is_expected: a_is_expected, span: span})
diff --git a/src/rustc/middle/typeck/infer/region_var_bindings.rs b/src/rustc/middle/typeck/infer/region_var_bindings.rs
index a39152e155e..a5cfbaa8736 100644
--- a/src/rustc/middle/typeck/infer/region_var_bindings.rs
+++ b/src/rustc/middle/typeck/infer/region_var_bindings.rs
@@ -305,7 +305,7 @@ because `&x` was created alone, but is relatable to `&A`.
 #[warn(deprecated_mode)];
 #[warn(deprecated_pattern)];
 
-import dvec::{DVec, dvec};
+import dvec::DVec;
 import result::Result;
 import result::{Ok, Err};
 import std::map::{hashmap, uint_hash};
@@ -365,12 +365,12 @@ struct RegionVarBindings {
 fn RegionVarBindings(tcx: ty::ctxt) -> RegionVarBindings {
     RegionVarBindings {
         tcx: tcx,
-        var_spans: dvec(),
+        var_spans: DVec(),
         values: empty_cell(),
         constraints: hashmap(hash_constraint, sys::shape_eq),
         lubs: CombineMap(),
         glbs: CombineMap(),
-        undo_log: dvec()
+        undo_log: DVec()
     }
 }