From ab387a68388974a432951e806851936898907fd0 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 28 Nov 2013 12:22:53 -0800 Subject: Register new snapshots --- src/libsyntax/ext/base.rs | 6 +++--- src/libsyntax/ext/concat.rs | 2 +- src/libsyntax/ext/deriving/clone.rs | 6 +++--- src/libsyntax/ext/deriving/default.rs | 2 +- src/libsyntax/ext/deriving/generic.rs | 4 ++-- src/libsyntax/ext/deriving/iter_bytes.rs | 2 +- src/libsyntax/ext/deriving/primitive.rs | 2 +- src/libsyntax/ext/deriving/to_str.rs | 6 +++--- src/libsyntax/ext/deriving/ty.rs | 4 ++-- src/libsyntax/ext/deriving/zero.rs | 2 +- src/libsyntax/ext/expand.rs | 12 ++++++------ src/libsyntax/ext/format.rs | 4 ++-- src/libsyntax/ext/quote.rs | 2 +- src/libsyntax/ext/source_util.rs | 6 +++--- src/libsyntax/ext/tt/macro_parser.rs | 4 ++-- src/libsyntax/ext/tt/transcribe.rs | 4 ++-- 16 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index deaa821cd45..a773fe8497c 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -340,7 +340,7 @@ impl ExtCtxt { pub fn expand_expr(@self, mut e: @ast::Expr) -> @ast::Expr { loop { match e.node { - ast::ExprMac(*) => { + ast::ExprMac(..) => { let extsbox = @mut syntax_expander_table(); let expander = expand::MacroExpander { extsbox: extsbox, @@ -358,7 +358,7 @@ impl ExtCtxt { pub fn cfg(&self) -> ast::CrateConfig { self.cfg.clone() } pub fn call_site(&self) -> Span { match *self.backtrace { - Some(@ExpnInfo {call_site: cs, _}) => cs, + Some(@ExpnInfo {call_site: cs, ..}) => cs, None => self.bug("missing top span") } } @@ -381,7 +381,7 @@ impl ExtCtxt { pub fn bt_pop(&self) { match *self.backtrace { Some(@ExpnInfo { - call_site: Span {expn_info: prev, _}, _}) => { + call_site: Span {expn_info: prev, ..}, ..}) => { *self.backtrace = prev } _ => self.bug("tried to pop without a push") diff --git a/src/libsyntax/ext/concat.rs b/src/libsyntax/ext/concat.rs index a89e8d261fe..11e316e3e6b 100644 --- a/src/libsyntax/ext/concat.rs +++ b/src/libsyntax/ext/concat.rs @@ -44,7 +44,7 @@ pub fn expand_syntax_ext(cx: @base::ExtCtxt, ast::lit_bool(b) => { accumulator.push_str(format!("{}", b)); } - ast::lit_binary(*) => { + ast::lit_binary(..) => { cx.span_err(e.span, "cannot concatenate a binary literal"); } } diff --git a/src/libsyntax/ext/deriving/clone.rs b/src/libsyntax/ext/deriving/clone.rs index 6dd358144a4..0f83f725223 100644 --- a/src/libsyntax/ext/deriving/clone.rs +++ b/src/libsyntax/ext/deriving/clone.rs @@ -87,16 +87,16 @@ fn cs_clone( ctor_ident = variant.node.name; all_fields = af; }, - EnumNonMatching(*) => cx.span_bug(span, + EnumNonMatching(..) => cx.span_bug(span, format!("Non-matching enum variants in `deriving({})`", name)), - StaticEnum(*) | StaticStruct(*) => cx.span_bug(span, + StaticEnum(..) | StaticStruct(..) => cx.span_bug(span, format!("Static method in `deriving({})`", name)) } match *all_fields { - [FieldInfo { name: None, _ }, .. _] => { + [FieldInfo { name: None, .. }, ..] => { // enum-like let subcalls = all_fields.map(|field| subcall(field.self_)); cx.expr_call_ident(span, ctor_ident, subcalls) diff --git a/src/libsyntax/ext/deriving/default.rs b/src/libsyntax/ext/deriving/default.rs index 015083f11d3..3ecdd5e60fe 100644 --- a/src/libsyntax/ext/deriving/default.rs +++ b/src/libsyntax/ext/deriving/default.rs @@ -67,7 +67,7 @@ fn default_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Exp } } } - StaticEnum(*) => { + StaticEnum(..) => { cx.span_fatal(span, "`Default` cannot be derived for enums, \ only structs") } diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs index 614c719e0a2..e882650f046 100644 --- a/src/libsyntax/ext/deriving/generic.rs +++ b/src/libsyntax/ext/deriving/generic.rs @@ -1087,7 +1087,7 @@ pub fn cs_fold(use_foldl: bool, EnumNonMatching(ref all_enums) => enum_nonmatch_f(cx, trait_span, *all_enums, substructure.nonself_args), - StaticEnum(*) | StaticStruct(*) => { + StaticEnum(..) | StaticStruct(..) => { cx.span_bug(trait_span, "Static function in `deriving`") } } @@ -1125,7 +1125,7 @@ pub fn cs_same_method(f: |@ExtCtxt, Span, ~[@Expr]| -> @Expr, EnumNonMatching(ref all_enums) => enum_nonmatch_f(cx, trait_span, *all_enums, substructure.nonself_args), - StaticEnum(*) | StaticStruct(*) => { + StaticEnum(..) | StaticStruct(..) => { cx.span_bug(trait_span, "Static function in `deriving`") } } diff --git a/src/libsyntax/ext/deriving/iter_bytes.rs b/src/libsyntax/ext/deriving/iter_bytes.rs index 7e3debd7967..f291d2b751d 100644 --- a/src/libsyntax/ext/deriving/iter_bytes.rs +++ b/src/libsyntax/ext/deriving/iter_bytes.rs @@ -82,7 +82,7 @@ fn iter_bytes_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @ _ => cx.span_bug(span, "Impossible substructure in `deriving(IterBytes)`") } - for &FieldInfo { self_, _ } in fields.iter() { + for &FieldInfo { self_, .. } in fields.iter() { exprs.push(call_iterbytes(self_)); } diff --git a/src/libsyntax/ext/deriving/primitive.rs b/src/libsyntax/ext/deriving/primitive.rs index 77b0d913dcd..b26a3a09f04 100644 --- a/src/libsyntax/ext/deriving/primitive.rs +++ b/src/libsyntax/ext/deriving/primitive.rs @@ -69,7 +69,7 @@ fn cs_from(name: &str, cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Expr }; match *substr.fields { - StaticStruct(*) => { + StaticStruct(..) => { cx.span_err(span, "`FromPrimitive` cannot be derived for structs"); return cx.expr_fail(span, @""); } diff --git a/src/libsyntax/ext/deriving/to_str.rs b/src/libsyntax/ext/deriving/to_str.rs index 26f4668ccfd..193dc4965fc 100644 --- a/src/libsyntax/ext/deriving/to_str.rs +++ b/src/libsyntax/ext/deriving/to_str.rs @@ -66,7 +66,7 @@ fn to_str_substructure(cx: @ExtCtxt, span: Span, stmts.push(cx.stmt_expr(call)); }; - for (i, &FieldInfo {name, span, self_, _}) in fields.iter().enumerate() { + for (i, &FieldInfo {name, span, self_, .. }) in fields.iter().enumerate() { if i > 0 { push(cx.expr_str(span, @", ")); } @@ -96,9 +96,9 @@ fn to_str_substructure(cx: @ExtCtxt, span: Span, EnumMatching(_, variant, ref fields) => { match variant.node.kind { - ast::tuple_variant_kind(*) => + ast::tuple_variant_kind(..) => doit("(", @")", variant.node.name, *fields), - ast::struct_variant_kind(*) => + ast::struct_variant_kind(..) => doit("{", @"}", variant.node.name, *fields), } } diff --git a/src/libsyntax/ext/deriving/ty.rs b/src/libsyntax/ext/deriving/ty.rs index eb957e80835..af6379d476e 100644 --- a/src/libsyntax/ext/deriving/ty.rs +++ b/src/libsyntax/ext/deriving/ty.rs @@ -182,8 +182,8 @@ impl<'self> Ty<'self> { Literal(ref p) => { p.to_path(cx, span, self_ty, self_generics) } - Ptr(*) => { cx.span_bug(span, "Pointer in a path in generic `deriving`") } - Tuple(*) => { cx.span_bug(span, "Tuple in a path in generic `deriving`") } + Ptr(..) => { cx.span_bug(span, "Pointer in a path in generic `deriving`") } + Tuple(..) => { cx.span_bug(span, "Tuple in a path in generic `deriving`") } } } } diff --git a/src/libsyntax/ext/deriving/zero.rs b/src/libsyntax/ext/deriving/zero.rs index a37cb586f59..1fdb4131689 100644 --- a/src/libsyntax/ext/deriving/zero.rs +++ b/src/libsyntax/ext/deriving/zero.rs @@ -83,7 +83,7 @@ fn zero_substructure(cx: @ExtCtxt, span: Span, substr: &Substructure) -> @Expr { } } } - StaticEnum(*) => { + StaticEnum(..) => { cx.span_fatal(span, "`Zero` cannot be derived for enums, \ only structs") } diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 45f82d9b3a9..85839691b48 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -313,7 +313,7 @@ pub fn expand_item(extsbox: @mut SyntaxEnv, fld: &MacroExpander) -> SmallVector<@ast::item> { match it.node { - ast::item_mac(*) => expand_item_mac(extsbox, cx, it, fld), + ast::item_mac(..) => expand_item_mac(extsbox, cx, it, fld), ast::item_mod(_) | ast::item_foreign_mod(_) => { cx.mod_push(it.ident); let macro_escape = contains_macro_escape(it.attrs); @@ -342,7 +342,7 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv, let (pth, tts, ctxt) = match it.node { item_mac(codemap::Spanned { node: mac_invoc_tt(ref pth, ref tts, ctxt), - _ + .. }) => { (pth, (*tts).clone(), ctxt) } @@ -430,8 +430,8 @@ fn insert_macro(exts: SyntaxEnv, name: ast::Name, transformer: @Transformer) { let is_non_escaping_block = |t : &@Transformer| -> bool{ match t { - &@BlockInfo(BlockInfo {macros_escape:false,_}) => true, - &@BlockInfo(BlockInfo {_}) => false, + &@BlockInfo(BlockInfo {macros_escape:false,..}) => true, + &@BlockInfo(BlockInfo {..}) => false, _ => fail!("special identifier {:?} was bound to a non-BlockInfo", special_block_name) } @@ -1400,7 +1400,7 @@ mod test { visit::walk_crate(&mut path_finder, &renamed_ast, ()); match path_finder.path_accumulator { - [ast::Path{segments:[ref seg],_}] => + [ast::Path{segments:[ref seg],..}] => assert_eq!(mtwt_resolve(seg.identifier),a2_name), _ => assert_eq!(0,1) } @@ -1415,7 +1415,7 @@ mod test { let mut path_finder = new_path_finder(~[]); visit::walk_crate(&mut path_finder, &double_renamed, ()); match path_finder.path_accumulator { - [ast::Path{segments:[ref seg],_}] => + [ast::Path{segments:[ref seg],..}] => assert_eq!(mtwt_resolve(seg.identifier),a3_name), _ => assert_eq!(0,1) } diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 1c0930f984a..c7354b0601c 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -125,7 +125,7 @@ impl Context { /// format strings. fn verify_piece(&mut self, p: &parse::Piece) { match *p { - parse::String(*) => {} + parse::String(..) => {} parse::CurrentArgument => { if self.nest_level == 0 { self.ecx.span_err(self.fmtsp, @@ -173,7 +173,7 @@ impl Context { fn verify_count(&mut self, c: parse::Count) { match c { - parse::CountImplied | parse::CountIs(*) => {} + parse::CountImplied | parse::CountIs(..) => {} parse::CountIsParam(i) => { self.verify_arg_type(Left(i), Unsigned); } diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index d10ec422987..fe7699f36bb 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -553,7 +553,7 @@ fn mk_tt(cx: @ExtCtxt, sp: Span, tt: &ast::token_tree) } ast::tt_delim(ref tts) => mk_tts(cx, sp, **tts), - ast::tt_seq(*) => fail!("tt_seq in quote!"), + ast::tt_seq(..) => fail!("tt_seq in quote!"), ast::tt_nonterminal(sp, ident) => { diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 5a37e0a5ab3..c0c5c6c6c07 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -128,13 +128,13 @@ pub fn expand_include_bin(cx: @ExtCtxt, sp: Span, tts: &[ast::token_tree]) // recur along an ExpnInfo chain to find the original expression fn topmost_expn_info(expn_info: @codemap::ExpnInfo) -> @codemap::ExpnInfo { match *expn_info { - ExpnInfo { call_site: ref call_site, _ } => { + ExpnInfo { call_site: ref call_site, .. } => { match call_site.expn_info { Some(next_expn_info) => { match *next_expn_info { ExpnInfo { - callee: NameAndSpan { name: ref name, _ }, - _ + callee: NameAndSpan { name: ref name, .. }, + .. } => { // Don't recurse into file using "include!" if "include" == *name { diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 3e877d29300..3da2eac1a3d 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -193,8 +193,8 @@ pub fn nameize(p_s: @mut ParseSess, ms: &[matcher], res: &[@named_match]) fn n_rec(p_s: @mut ParseSess, m: &matcher, res: &[@named_match], ret_val: &mut HashMap) { match *m { - codemap::Spanned {node: match_tok(_), _} => (), - codemap::Spanned {node: match_seq(ref more_ms, _, _, _, _), _} => { + codemap::Spanned {node: match_tok(_), .. } => (), + codemap::Spanned {node: match_seq(ref more_ms, _, _, _, _), .. } => { for next_m in more_ms.iter() { n_rec(p_s, next_m, res, ret_val) }; diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 1bcfbcf7ab2..58a114a2de0 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -156,7 +156,7 @@ fn lockstep_iter_size(t: &token_tree, r: &mut TtReader) -> lis { lis_merge(lis, lis2) }) } - tt_tok(*) => lis_unconstrained, + tt_tok(..) => lis_unconstrained, tt_nonterminal(_, name) => match *lookup_cur_matched(r, name) { matched_nonterminal(_) => lis_unconstrained, matched_seq(ref ads, _) => lis_constraint(ads.len(), name) @@ -290,7 +290,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan { r.stack.idx += 1u; return ret_val; } - matched_seq(*) => { + matched_seq(..) => { r.sp_diag.span_fatal( r.cur_span, /* blame the macro writer */ format!("variable '{}' is still repeating at this depth", -- cgit 1.4.1-3-g733a5