From 74c69e1053188d92b86bc8b28cbf1af87d31ea2d Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 14 Aug 2012 16:54:13 -0700 Subject: Convert more core types to camel case --- src/libsyntax/ext/pipes/proto.rs | 6 +++--- src/libsyntax/ext/qquote.rs | 4 ++-- src/libsyntax/ext/simplext.rs | 4 ++-- src/libsyntax/ext/tt/earley_parser.rs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/pipes/proto.rs b/src/libsyntax/ext/pipes/proto.rs index 5fba31ed6e7..100f248a7ad 100644 --- a/src/libsyntax/ext/pipes/proto.rs +++ b/src/libsyntax/ext/pipes/proto.rs @@ -1,5 +1,5 @@ import to_str::ToStr; -import dvec::dvec; +import dvec::{DVec, dvec}; import ast::{ident}; @@ -62,7 +62,7 @@ enum state { span: span, dir: direction, ty_params: ~[ast::ty_param], - messages: dvec, + messages: DVec, proto: protocol, }), } @@ -112,7 +112,7 @@ fn protocol(name: ident, +span: span) -> protocol { class protocol_ { let name: ident; let span: span; - let states: dvec; + let states: DVec; let mut bounded: option; diff --git a/src/libsyntax/ext/qquote.rs b/src/libsyntax/ext/qquote.rs index c5af28bc0b3..6b5dce312d6 100644 --- a/src/libsyntax/ext/qquote.rs +++ b/src/libsyntax/ext/qquote.rs @@ -2,7 +2,7 @@ import ast::{crate, expr_, mac_invoc, mac_aq, mac_var}; import parse::parser; import parse::parser::parse_from_source_str; -import dvec::dvec; +import dvec::{DVec, dvec}; import fold::*; import visit::*; @@ -20,7 +20,7 @@ struct gather_item { constr: ~str; } -type aq_ctxt = @{lo: uint, gather: dvec}; +type aq_ctxt = @{lo: uint, gather: DVec}; enum fragment { from_expr(@ast::expr), from_ty(@ast::ty) diff --git a/src/libsyntax/ext/simplext.rs b/src/libsyntax/ext/simplext.rs index 98289152d33..e8899a2e541 100644 --- a/src/libsyntax/ext/simplext.rs +++ b/src/libsyntax/ext/simplext.rs @@ -1,6 +1,6 @@ import codemap::span; import std::map::{hashmap, str_hash, box_str_hash}; -import dvec::dvec; +import dvec::{DVec, dvec}; import base::*; @@ -124,7 +124,7 @@ fn compose_sels(s1: selector, s2: selector) -> selector { type binders = {real_binders: hashmap, - literal_ast_matchers: dvec}; + literal_ast_matchers: DVec}; type bindings = hashmap>; fn acumm_bindings(_cx: ext_ctxt, _b_dest: bindings, _b_src: bindings) { } diff --git a/src/libsyntax/ext/tt/earley_parser.rs b/src/libsyntax/ext/tt/earley_parser.rs index 7cc9b0e1dc2..b6dc1c05a2c 100644 --- a/src/libsyntax/ext/tt/earley_parser.rs +++ b/src/libsyntax/ext/tt/earley_parser.rs @@ -7,7 +7,7 @@ import parse::parser::{parser,SOURCE_FILE}; //import parse::common::parser_common; import parse::common::*; //resolve bug? import parse::parse_sess; -import dvec::dvec; +import dvec::{DVec, dvec}; import ast::{matcher, match_tok, match_seq, match_nonterminal, ident}; import ast_util::mk_sp; import std::map::{hashmap, box_str_hash}; @@ -42,7 +42,7 @@ type matcher_pos = ~{ sep: option, mut idx: uint, mut up: matcher_pos_up, // mutable for swapping only - matches: ~[dvec<@named_match>], + matches: ~[DVec<@named_match>], match_lo: uint, match_hi: uint, sp_lo: uint, }; -- cgit 1.4.1-3-g733a5