From cb7a5395ddfaa7b8fc40db57b32c22f69780ccd6 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 10 Sep 2012 15:38:28 -0700 Subject: Convert std::map to camel case --- src/rustc/metadata/creader.rs | 2 +- src/rustc/metadata/csearch.rs | 2 +- src/rustc/metadata/cstore.rs | 10 +++++----- src/rustc/metadata/decoder.rs | 2 +- src/rustc/metadata/encoder.rs | 16 ++++++++-------- src/rustc/metadata/tydecode.rs | 2 +- src/rustc/metadata/tyencode.rs | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/rustc/metadata') diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs index 444662ae0e2..ab7ee46dc64 100644 --- a/src/rustc/metadata/creader.rs +++ b/src/rustc/metadata/creader.rs @@ -5,7 +5,7 @@ use syntax::{ast, ast_util}; use syntax::attr; use syntax::visit; use syntax::codemap::span; -use std::map::{hashmap, int_hash}; +use std::map::{HashMap, int_hash}; use syntax::print::pprust; use filesearch::filesearch; use common::*; diff --git a/src/rustc/metadata/csearch.rs b/src/rustc/metadata/csearch.rs index 69fc8b81b23..e29a4fd436b 100644 --- a/src/rustc/metadata/csearch.rs +++ b/src/rustc/metadata/csearch.rs @@ -10,7 +10,7 @@ use syntax::diagnostic::span_handler; use syntax::diagnostic::expect; use ast_util::dummy_sp; use common::*; -use std::map::hashmap; +use std::map::HashMap; use dvec::DVec; export class_dtor; diff --git a/src/rustc/metadata/cstore.rs b/src/rustc/metadata/cstore.rs index ce20569116d..be974cb75b5 100644 --- a/src/rustc/metadata/cstore.rs +++ b/src/rustc/metadata/cstore.rs @@ -2,7 +2,7 @@ // crates and libraries use std::map; -use std::map::hashmap; +use std::map::HashMap; use syntax::{ast, attr}; use syntax::ast_util::new_def_hash; use syntax::parse::token::ident_interner; @@ -33,12 +33,12 @@ export get_path; // local crate numbers (as generated during this session). Each external // crate may refer to types in other external crates, and each has their // own crate numbers. -type cnum_map = map::hashmap; +type cnum_map = map::HashMap; // Multiple items may have the same def_id in crate metadata. They may be // renamed imports or reexports. This map keeps the "real" module path // and def_id. -type mod_path_map = map::hashmap; +type mod_path_map = map::HashMap; type crate_metadata = @{name: ~str, data: @~[u8], @@ -53,7 +53,7 @@ type crate_metadata = @{name: ~str, enum cstore { private(cstore_private), } type cstore_private = - @{metas: map::hashmap, + @{metas: map::HashMap, use_crate_map: use_crate_map, mod_path_map: mod_path_map, mut used_crate_files: ~[Path], @@ -62,7 +62,7 @@ type cstore_private = intr: ident_interner}; // Map from node_id's of local use statements to crate numbers -type use_crate_map = map::hashmap; +type use_crate_map = map::HashMap; // Internal method to retrieve the data from the cstore pure fn p(cstore: cstore) -> cstore_private { diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs index fc158feffad..3f21caafb66 100644 --- a/src/rustc/metadata/decoder.rs +++ b/src/rustc/metadata/decoder.rs @@ -1,7 +1,7 @@ // Decoding metadata from a single crate's metadata use std::{ebml, map}; -use std::map::{hashmap, str_hash}; +use std::map::{HashMap, str_hash}; use io::WriterUtil; use dvec::DVec; use syntax::{ast, ast_util}; diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs index 560dc384299..313723fc158 100644 --- a/src/rustc/metadata/encoder.rs +++ b/src/rustc/metadata/encoder.rs @@ -3,7 +3,7 @@ use util::ppaux::ty_to_str; use std::{ebml, map}; -use std::map::hashmap; +use std::map::HashMap; use io::WriterUtil; use ebml::Writer; use syntax::ast::*; @@ -35,7 +35,7 @@ export encode_ctxt; export write_type; export encode_def_id; -type abbrev_map = map::hashmap; +type abbrev_map = map::HashMap; type encode_inlined_item = fn@(ecx: @encode_ctxt, ebml_w: ebml::Writer, @@ -45,11 +45,11 @@ type encode_inlined_item = fn@(ecx: @encode_ctxt, type encode_parms = { diag: span_handler, tcx: ty::ctxt, - reachable: hashmap, + reachable: HashMap, reexports: ~[(~str, def_id)], reexports2: middle::resolve::ExportMap2, - item_symbols: hashmap, - discrim_symbols: hashmap, + item_symbols: HashMap, + discrim_symbols: HashMap, link_meta: link_meta, cstore: cstore::cstore, encode_inlined_item: encode_inlined_item @@ -72,11 +72,11 @@ enum encode_ctxt = { tcx: ty::ctxt, buf: io::MemBuffer, stats: stats, - reachable: hashmap, + reachable: HashMap, reexports: ~[(~str, def_id)], reexports2: middle::resolve::ExportMap2, - item_symbols: hashmap, - discrim_symbols: hashmap, + item_symbols: HashMap, + discrim_symbols: HashMap, link_meta: link_meta, cstore: cstore::cstore, encode_inlined_item: encode_inlined_item, diff --git a/src/rustc/metadata/tydecode.rs b/src/rustc/metadata/tydecode.rs index 8fe58a93824..0c94213c08c 100644 --- a/src/rustc/metadata/tydecode.rs +++ b/src/rustc/metadata/tydecode.rs @@ -8,7 +8,7 @@ use syntax::ast::*; use syntax::ast_util; use syntax::ast_util::respan; use middle::ty; -use std::map::hashmap; +use std::map::HashMap; use ty::{FnTyBase, FnMeta, FnSig}; export parse_ty_data, parse_def_id, parse_ident; diff --git a/src/rustc/metadata/tyencode.rs b/src/rustc/metadata/tyencode.rs index 622ba1a5cce..3d256367023 100644 --- a/src/rustc/metadata/tyencode.rs +++ b/src/rustc/metadata/tyencode.rs @@ -1,7 +1,7 @@ // Type encoding use io::WriterUtil; -use std::map::hashmap; +use std::map::HashMap; use syntax::ast::*; use syntax::diagnostic::span_handler; use middle::ty; @@ -31,7 +31,7 @@ type ctxt = { // Whatever format you choose should not contain pipe characters. type ty_abbrev = {pos: uint, len: uint, s: @~str}; -enum abbrev_ctxt { ac_no_abbrevs, ac_use_abbrevs(hashmap), } +enum abbrev_ctxt { ac_no_abbrevs, ac_use_abbrevs(HashMap), } fn cx_uses_abbrevs(cx: @ctxt) -> bool { match cx.abbrevs { -- cgit 1.4.1-3-g733a5