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/parse | |
| parent | 29003c799f41cce948bc043cdd1350ca4bee949e (diff) | |
| download | rust-cb7a5395ddfaa7b8fc40db57b32c22f69780ccd6.tar.gz rust-cb7a5395ddfaa7b8fc40db57b32c22f69780ccd6.zip | |
Convert std::map to camel case
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/common.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 12 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs index c2ed8a7d9d6..d71d95fd63f 100644 --- a/src/libsyntax/parse/common.rs +++ b/src/libsyntax/parse/common.rs @@ -1,4 +1,4 @@ -use std::map::{hashmap}; +use std::map::{HashMap}; use ast_util::spanned; use parser::parser; use lexer::reader; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 512a5e6459e..e597d33a836 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2,7 +2,7 @@ use print::pprust::expr_to_str; use result::Result; use either::{Either, Left, Right}; -use std::map::{hashmap, str_hash}; +use std::map::{HashMap, str_hash}; use token::{can_begin_expr, is_ident, is_ident_or_path, is_plain_ident, INTERPOLATED}; use codemap::{span,fss_none}; @@ -216,7 +216,7 @@ fn parser(sess: parse_sess, cfg: ast::crate_cfg, keywords: token::keyword_table(), restricted_keywords: token::restricted_keyword_table(), strict_keywords: token::strict_keyword_table(), - obsolete_set: std::map::hashmap(), + obsolete_set: std::map::HashMap(), } } @@ -234,12 +234,12 @@ struct parser { mut quote_depth: uint, // not (yet) related to the quasiquoter reader: reader, interner: interner<@~str>, - keywords: hashmap<~str, ()>, - restricted_keywords: hashmap<~str, ()>, - strict_keywords: hashmap<~str, ()>, + keywords: HashMap<~str, ()>, + restricted_keywords: HashMap<~str, ()>, + strict_keywords: HashMap<~str, ()>, /// The set of seen errors about obsolete syntax. Used to suppress /// extra detail when the same error is seen twice - obsolete_set: hashmap<ObsoleteSyntax, ()>, + obsolete_set: HashMap<ObsoleteSyntax, ()>, drop {} /* do not copy the parser; its state is tied to outside state */ } diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 6e82e6d11b8..a96b2be6c09 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -1,6 +1,6 @@ use util::interner; use util::interner::interner; -use std::map::{hashmap, str_hash}; +use std::map::{HashMap, str_hash}; use std::serialization::{serializer, deserializer, serialize_uint, @@ -368,7 +368,7 @@ fn mk_fake_ident_interner() -> ident_interner { * that might otherwise contain _value identifiers_. Strict keywords may not * appear as identifiers. */ -fn keyword_table() -> hashmap<~str, ()> { +fn keyword_table() -> HashMap<~str, ()> { let keywords = str_hash(); for contextual_keyword_table().each_key |word| { keywords.insert(word, ()); @@ -383,7 +383,7 @@ fn keyword_table() -> hashmap<~str, ()> { } /// Keywords that may be used as identifiers -fn contextual_keyword_table() -> hashmap<~str, ()> { +fn contextual_keyword_table() -> HashMap<~str, ()> { let words = str_hash(); let keys = ~[ ~"self", ~"static", @@ -408,7 +408,7 @@ fn contextual_keyword_table() -> hashmap<~str, ()> { * * `true` or `false` as identifiers would always be shadowed by * the boolean constants */ -fn restricted_keyword_table() -> hashmap<~str, ()> { +fn restricted_keyword_table() -> HashMap<~str, ()> { let words = str_hash(); let keys = ~[ ~"const", ~"copy", @@ -426,7 +426,7 @@ fn restricted_keyword_table() -> hashmap<~str, ()> { } /// Full keywords. May not appear anywhere else. -fn strict_keyword_table() -> hashmap<~str, ()> { +fn strict_keyword_table() -> HashMap<~str, ()> { let words = str_hash(); let keys = ~[ ~"as", ~"assert", |
