diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-10 15:38:28 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-10 17:08:36 -0700 |
| commit | cb7a5395ddfaa7b8fc40db57b32c22f69780ccd6 (patch) | |
| tree | 4c79be0560610f8ae49a16670ff9dede47bcaaf1 /src/libsyntax/ext/tt | |
| parent | 29003c799f41cce948bc043cdd1350ca4bee949e (diff) | |
| download | rust-cb7a5395ddfaa7b8fc40db57b32c22f69780ccd6.tar.gz rust-cb7a5395ddfaa7b8fc40db57b32c22f69780ccd6.zip | |
Convert std::map to camel case
Diffstat (limited to 'src/libsyntax/ext/tt')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 10 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/transcribe.rs | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 22f588f98c5..f32c23c936f 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -10,7 +10,7 @@ use parse::parse_sess; use dvec::DVec; use ast::{matcher, match_tok, match_seq, match_nonterminal, ident}; use ast_util::mk_sp; -use std::map::{hashmap, uint_hash}; +use std::map::{HashMap, uint_hash}; /* This is an Earley-like parser, without support for in-grammar nonterminals, only by calling out to the main rust parser for named nonterminals (which it @@ -168,9 +168,9 @@ enum named_match { type earley_item = matcher_pos; fn nameize(p_s: parse_sess, ms: ~[matcher], res: ~[@named_match]) - -> hashmap<ident,@named_match> { + -> HashMap<ident,@named_match> { fn n_rec(p_s: parse_sess, m: matcher, res: ~[@named_match], - ret_val: hashmap<ident, @named_match>) { + ret_val: HashMap<ident, @named_match>) { match m { {node: match_tok(_), span: _} => (), {node: match_seq(more_ms, _, _, _, _), span: _} => { @@ -191,13 +191,13 @@ fn nameize(p_s: parse_sess, ms: ~[matcher], res: ~[@named_match]) } enum parse_result { - success(hashmap<ident, @named_match>), + success(HashMap<ident, @named_match>), failure(codemap::span, ~str), error(codemap::span, ~str) } fn parse_or_else(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader, - ms: ~[matcher]) -> hashmap<ident, @named_match> { + ms: ~[matcher]) -> HashMap<ident, @named_match> { match parse(sess, cfg, rdr, ms) { success(m) => m, failure(sp, str) => sess.span_diagnostic.span_fatal(sp, str), diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 30b5d479f05..ebb62293cc5 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -7,7 +7,7 @@ use parse::token::{FAT_ARROW, SEMI, LBRACE, RBRACE, nt_matchers, nt_tt}; use parse::parser::{parser, SOURCE_FILE}; use macro_parser::{parse, parse_or_else, success, failure, named_match, matched_seq, matched_nonterminal, error}; -use std::map::hashmap; +use std::map::HashMap; use parse::token::special_idents; fn add_new_extension(cx: ext_ctxt, sp: span, name: ident, diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 01e2328c85a..f7c7475bfc9 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -4,7 +4,7 @@ use macro_parser::{named_match, matched_seq, matched_nonterminal}; use codemap::span; use parse::token::{EOF, INTERPOLATED, IDENT, token, nt_ident, ident_interner}; -use std::map::{hashmap, box_str_hash}; +use std::map::{HashMap, box_str_hash}; export tt_reader, new_tt_reader, dup_tt_reader, tt_next_token; @@ -28,7 +28,7 @@ type tt_reader = @{ interner: ident_interner, mut cur: tt_frame, /* for MBE-style macro transcription */ - interpolations: std::map::hashmap<ident, @named_match>, + interpolations: std::map::HashMap<ident, @named_match>, mut repeat_idx: ~[mut uint], mut repeat_len: ~[uint], /* cached: */ @@ -40,7 +40,7 @@ type tt_reader = @{ * `src` contains no `tt_seq`s and `tt_nonterminal`s, `interp` can (and * should) be none. */ fn new_tt_reader(sp_diag: span_handler, itr: ident_interner, - interp: Option<std::map::hashmap<ident,@named_match>>, + interp: Option<std::map::HashMap<ident,@named_match>>, src: ~[ast::token_tree]) -> tt_reader { let r = @{sp_diag: sp_diag, interner: itr, |
