std: Camel case list

8 files changed, 16 insertions, 16 deletions

diff --git a/src/rustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs
index c5679351941..18df37373b1 100644
--- a/src/rustc/middle/borrowck.rs
+++ b/src/rustc/middle/borrowck.rs
@@ -223,7 +223,7 @@ use syntax::codemap::span;
 use util::ppaux::{ty_to_str, region_to_str, explain_region};
 use std::map::{int_hash, hashmap, set};
 use std::list;
-use std::list::{list, cons, nil};
+use std::list::{List, Cons, Nil};
 use result::{Result, Ok, Err};
 use syntax::print::pprust;
 use util::common::indenter;
diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs
index 25fbe1b99ad..7745d7b9eef 100644
--- a/src/rustc/middle/resolve.rs
+++ b/src/rustc/middle/resolve.rs
@@ -59,7 +59,7 @@ use str::{connect, split_str};
 use vec::pop;
 use syntax::parse::token::ident_interner;
 
-use std::list::{cons, list, nil};
+use std::list::{Cons, List, Nil};
 use std::map::{hashmap, int_hash, uint_hash};
 use str_eq = str::eq;
 
diff --git a/src/rustc/middle/trans/type_use.rs b/src/rustc/middle/trans/type_use.rs
index 3a09b2f0fdc..faf01781289 100644
--- a/src/rustc/middle/trans/type_use.rs
+++ b/src/rustc/middle/trans/type_use.rs
@@ -19,7 +19,7 @@
 
 use std::map::hashmap;
 use std::list;
-use std::list::{list, cons, nil};
+use std::list::{List, Cons, Nil};
 use driver::session::session;
 use metadata::csearch;
 use syntax::ast::*, syntax::ast_util, syntax::visit;
@@ -122,14 +122,14 @@ fn type_needs(cx: ctx, use: uint, ty: ty::t) {
     // Optimization -- don't descend type if all params already have this use
     for vec::each_mut(cx.uses) |u| {
         if *u & use != use {
-            type_needs_inner(cx, use, ty, @nil);
+            type_needs_inner(cx, use, ty, @Nil);
             return;
         }
     }
 }
 
 fn type_needs_inner(cx: ctx, use: uint, ty: ty::t,
-                    enums_seen: @list<def_id>) {
+                    enums_seen: @List<def_id>) {
     do ty::maybe_walk_ty(ty) |ty| {
         if ty::type_has_params(ty) {
             match ty::get(ty).struct {
@@ -143,7 +143,7 @@ fn type_needs_inner(cx: ctx, use: uint, ty: ty::t,
                | ty::ty_trait(_, _, _) => false,
               ty::ty_enum(did, substs) => {
                 if option::is_none(list::find(enums_seen, |id| *id == did)) {
-                    let seen = @cons(did, enums_seen);
+                    let seen = @Cons(did, enums_seen);
                     for vec::each(*ty::enum_variants(cx.ccx.tcx, did)) |v| {
                         for vec::each(v.args) |aty| {
                             let t = ty::subst(cx.ccx.tcx, &substs, aty);
diff --git a/src/rustc/middle/typeck.rs b/src/rustc/middle/typeck.rs
index 9a838d4bc24..dc484f581e7 100644
--- a/src/rustc/middle/typeck.rs
+++ b/src/rustc/middle/typeck.rs
@@ -64,7 +64,7 @@ use util::ppaux::{ty_to_str, tys_to_str, region_to_str,
                      bound_region_to_str, vstore_to_str};
 use util::common::{indent, indenter};
 use std::list;
-use list::{list, nil, cons};
+use list::{List, Nil, Cons};
 
 export check_crate;
 export infer;
diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs
index b56a8efa606..dd8ac61dd46 100644
--- a/src/rustc/middle/typeck/check.rs
+++ b/src/rustc/middle/typeck/check.rs
@@ -157,7 +157,7 @@ fn blank_fn_ctxt(ccx: @crate_ctxt, rty: ty::t,
         indirect_ret_ty: None,
         purity: ast::pure_fn,
         mut region_lb: region_bnd,
-        in_scope_regions: @nil,
+        in_scope_regions: @Nil,
         inh: blank_inherited(ccx),
         ccx: ccx
     }
@@ -165,7 +165,7 @@ fn blank_fn_ctxt(ccx: @crate_ctxt, rty: ty::t,
 
 // a list of mapping from in-scope-region-names ("isr") to the
 // corresponding ty::region
-type isr_alist = @list<(ty::bound_region, ty::region)>;
+type isr_alist = @List<(ty::bound_region, ty::region)>;
 
 trait get_and_find_region {
     fn get(br: ty::bound_region) -> ty::region;
@@ -225,7 +225,7 @@ fn check_fn(ccx: @crate_ctxt,
     // the node_id of the body block.
 
     let {isr, self_info, fn_ty} = {
-        let old_isr = option::map_default(old_fcx, @nil,
+        let old_isr = option::map_default(old_fcx, @Nil,
                                          |fcx| fcx.in_scope_regions);
         replace_bound_regions_in_fn_ty(tcx, old_isr, self_info, fn_ty,
                                        |br| ty::re_free(body.node.id, br))
@@ -917,7 +917,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
             match structure_of(fcx, sp, in_fty) {
               ty::ty_fn(ref fn_ty) => {
                 replace_bound_regions_in_fn_ty(
-                    fcx.ccx.tcx, @nil, None, fn_ty,
+                    fcx.ccx.tcx, @Nil, None, fn_ty,
                     |_br| fcx.infcx().next_region_var(sp,
                                                       call_expr_id)).fn_ty
               }
@@ -1237,7 +1237,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
               Some(ty::ty_fn(ref fn_ty)) => {
                 let {fn_ty, _} =
                     replace_bound_regions_in_fn_ty(
-                        tcx, @nil, None, fn_ty,
+                        tcx, @Nil, None, fn_ty,
                         |br| ty::re_bound(ty::br_cap_avoid(expr.id, @br)));
                 (Some({inputs:fn_ty.inputs,
                        output:fn_ty.output}),
diff --git a/src/rustc/middle/typeck/check/regionmanip.rs b/src/rustc/middle/typeck/check/regionmanip.rs
index b0dd57890a9..2acdfbf8b74 100644
--- a/src/rustc/middle/typeck/check/regionmanip.rs
+++ b/src/rustc/middle/typeck/check/regionmanip.rs
@@ -103,7 +103,7 @@ fn replace_bound_regions_in_fn_ty(
               ty::re_bound(br) => {
                 match isr.find(br) {
                   Some(_) => isr,
-                  None => @cons((br, to_r(br)), isr)
+                  None => @Cons((br, to_r(br)), isr)
                 }
               }
             }
diff --git a/src/rustc/middle/typeck/infer/region_var_bindings.rs b/src/rustc/middle/typeck/infer/region_var_bindings.rs
index c0714294491..ff0afdb4816 100644
--- a/src/rustc/middle/typeck/infer/region_var_bindings.rs
+++ b/src/rustc/middle/typeck/infer/region_var_bindings.rs
@@ -310,7 +310,7 @@ use result::Result;
 use result::{Ok, Err};
 use std::map::{hashmap, uint_hash};
 use std::cell::{Cell, empty_cell};
-use std::list::{list, nil, cons};
+use std::list::{List, Nil, Cons};
 
 use ty::{region, region_vid, hash_region};
 use region::is_subregion_of;
diff --git a/src/rustc/middle/typeck/infer/sub.rs b/src/rustc/middle/typeck/infer/sub.rs
index 2363c2a8251..bb36473dc3d 100644
--- a/src/rustc/middle/typeck/infer/sub.rs
+++ b/src/rustc/middle/typeck/infer/sub.rs
@@ -133,7 +133,7 @@ impl Sub: combine {
         // First, we instantiate each bound region in the subtype with a fresh
         // region variable.
         let {fn_ty: a_fn_ty, _} = {
-            do replace_bound_regions_in_fn_ty(self.infcx.tcx, @nil,
+            do replace_bound_regions_in_fn_ty(self.infcx.tcx, @Nil,
                                               None, a) |br| {
                 // N.B.: The name of the bound region doesn't have
                 // anything to do with the region variable that's created
@@ -153,7 +153,7 @@ impl Sub: combine {
         // Second, we instantiate each bound region in the supertype with a
         // fresh concrete region.
         let {fn_ty: b_fn_ty, _} = {
-            do replace_bound_regions_in_fn_ty(self.infcx.tcx, @nil,
+            do replace_bound_regions_in_fn_ty(self.infcx.tcx, @Nil,
                                               None, b) |br| {
                 // FIXME: eventually re_skolemized (issue #2263)
                 ty::re_bound(br)