diff options
| author | Joshua Landau <joshua@landau.ws> | 2015-06-10 17:22:20 +0100 |
|---|---|---|
| committer | Joshua Landau <joshua@landau.ws> | 2015-06-10 21:14:03 +0100 |
| commit | ca7418b84658fc1c723672c462aa0a7878d88b64 (patch) | |
| tree | 6fba2849520c8c205c53ca12aaa8445eb8e03ab9 /src/libsyntax/ext | |
| parent | d8a9570154dfbc4032cb3a6ba8b51c6256518dcd (diff) | |
| download | rust-ca7418b84658fc1c723672c462aa0a7878d88b64.tar.gz rust-ca7418b84658fc1c723672c462aa0a7878d88b64.zip | |
Removed many pointless calls to *iter() and iter_mut()
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/deriving/generic/mod.rs | 12 | ||||
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/quote.rs | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index eab6c3ae725..3c432739111 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -549,10 +549,10 @@ impl<'a> TraitDef<'a> { .map(|ty_param| ty_param.ident.name) .collect(); - for field_ty in field_tys.into_iter() { + for field_ty in field_tys { let tys = find_type_parameters(&*field_ty, &ty_param_names); - for ty in tys.into_iter() { + for ty in tys { let mut bounds: Vec<_> = self.additional_bounds.iter().map(|p| { cx.typarambound(p.to_path(cx, self.span, type_ident, generics)) }).collect(); @@ -672,7 +672,7 @@ impl<'a> TraitDef<'a> { generics: &Generics) -> P<ast::Item> { let mut field_tys = Vec::new(); - for variant in enum_def.variants.iter() { + for variant in &enum_def.variants { match variant.node.kind { ast::VariantKind::TupleVariantKind(ref args) => { field_tys.extend(args.iter() @@ -967,7 +967,7 @@ impl<'a> MethodDef<'a> { // make a series of nested matches, to destructure the // structs. This is actually right-to-left, but it shouldn't // matter. - for (arg_expr, pat) in self_args.iter().zip(patterns.iter()) { + for (arg_expr, pat) in self_args.iter().zip(patterns) { body = cx.expr_match(trait_.span, arg_expr.clone(), vec!( cx.arm(trait_.span, vec!(pat.clone()), body) )) } @@ -1226,7 +1226,7 @@ impl<'a> MethodDef<'a> { let target_type_name = find_repr_type_name(&cx.parse_sess.span_diagnostic, type_attrs); - for (&ident, self_arg) in vi_idents.iter().zip(self_args.iter()) { + for (&ident, self_arg) in vi_idents.iter().zip(&self_args) { let path = vec![cx.ident_of_std("core"), cx.ident_of("intrinsics"), cx.ident_of("discriminant_value")]; @@ -1465,7 +1465,7 @@ impl<'a> TraitDef<'a> { // struct_type is definitely not Unknown, since struct_def.fields // must be nonempty to reach here let pattern = if struct_type == Record { - let field_pats = subpats.into_iter().zip(ident_expr.iter()) + let field_pats = subpats.into_iter().zip(&ident_expr) .map(|(pat, &(_, id, _, _))| { // id is guaranteed to be Some codemap::Spanned { diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index aa74c27dc61..4aa313f3e66 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -183,7 +183,7 @@ pub fn expand_expr(e: P<ast::Expr>, fld: &mut MacroExpander) -> P<ast::Expr> { let mut arms = Vec::with_capacity(else_if_arms.len() + 2); arms.push(pat_arm); - arms.extend(else_if_arms.into_iter()); + arms.extend(else_if_arms); arms.push(else_arm); let match_expr = fld.cx.expr(span, @@ -779,7 +779,7 @@ fn expand_non_macro_stmt(Spanned {node, span: stmt_span}: Stmt, fld: &mut MacroE }; // add them to the existing pending renames: fld.cx.syntax_env.info().pending_renames - .extend(new_pending_renames.into_iter()); + .extend(new_pending_renames); Local { id: id, ty: expanded_ty, diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index e0753b2f6f6..82c249d2585 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -49,7 +49,7 @@ pub mod rt { impl<T: ToTokens> ToTokens for Vec<T> { fn to_tokens(&self, cx: &ExtCtxt) -> Vec<TokenTree> { - self.iter().flat_map(|t| t.to_tokens(cx).into_iter()).collect() + self.iter().flat_map(|t| t.to_tokens(cx)).collect() } } @@ -387,7 +387,7 @@ pub fn expand_quote_matcher(cx: &mut ExtCtxt, -> Box<base::MacResult+'static> { let (cx_expr, tts) = parse_arguments_to_quote(cx, tts); let mut vector = mk_stmts_let(cx, sp); - vector.extend(statements_mk_tts(cx, &tts[..], true).into_iter()); + vector.extend(statements_mk_tts(cx, &tts[..], true)); let block = cx.expr_block( cx.block_all(sp, vector, @@ -593,7 +593,7 @@ fn expr_mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> P<ast::Expr> { fn statements_mk_tt(cx: &ExtCtxt, tt: &ast::TokenTree, matcher: bool) -> Vec<P<ast::Stmt>> { match *tt { ast::TtToken(sp, SubstNt(ident, _)) => { - // tt.extend($ident.to_tokens(ext_cx).into_iter()) + // tt.extend($ident.to_tokens(ext_cx)) let e_to_toks = cx.expr_method_call(sp, @@ -633,8 +633,8 @@ fn statements_mk_tt(cx: &ExtCtxt, tt: &ast::TokenTree, matcher: bool) -> Vec<P<a ast::TtDelimited(_, ref delimed) => { statements_mk_tt(cx, &delimed.open_tt(), matcher).into_iter() .chain(delimed.tts.iter() - .flat_map(|tt| statements_mk_tt(cx, tt, matcher).into_iter())) - .chain(statements_mk_tt(cx, &delimed.close_tt(), matcher).into_iter()) + .flat_map(|tt| statements_mk_tt(cx, tt, matcher))) + .chain(statements_mk_tt(cx, &delimed.close_tt(), matcher)) .collect() }, ast::TtSequence(sp, ref seq) => { @@ -646,7 +646,7 @@ fn statements_mk_tt(cx: &ExtCtxt, tt: &ast::TokenTree, matcher: bool) -> Vec<P<a let stmt_let_tt = cx.stmt_let(sp, true, id_ext("tt"), cx.expr_vec_ng(sp)); let mut tts_stmts = vec![stmt_let_tt]; - tts_stmts.extend(statements_mk_tts(cx, &seq.tts[..], matcher).into_iter()); + tts_stmts.extend(statements_mk_tts(cx, &seq.tts[..], matcher)); let e_tts = cx.expr_block(cx.block(sp, tts_stmts, Some(cx.expr_ident(sp, id_ext("tt"))))); let e_separator = match seq.separator { @@ -748,7 +748,7 @@ fn mk_stmts_let(cx: &ExtCtxt, sp: Span) -> Vec<P<ast::Stmt>> { fn statements_mk_tts(cx: &ExtCtxt, tts: &[ast::TokenTree], matcher: bool) -> Vec<P<ast::Stmt>> { let mut ss = Vec::new(); for tt in tts { - ss.extend(statements_mk_tt(cx, tt, matcher).into_iter()); + ss.extend(statements_mk_tt(cx, tt, matcher)); } ss } @@ -758,7 +758,7 @@ fn expand_tts(cx: &ExtCtxt, sp: Span, tts: &[ast::TokenTree]) let (cx_expr, tts) = parse_arguments_to_quote(cx, tts); let mut vector = mk_stmts_let(cx, sp); - vector.extend(statements_mk_tts(cx, &tts[..], false).into_iter()); + vector.extend(statements_mk_tts(cx, &tts[..], false)); let block = cx.expr_block( cx.block_all(sp, vector, @@ -780,7 +780,7 @@ fn expand_wrapper(cx: &ExtCtxt, // make item: `use ...;` let path = path.iter().map(|s| s.to_string()).collect(); cx.stmt_item(sp, cx.item_use_glob(sp, ast::Inherited, ids_ext(path))) - }).chain(Some(stmt_let_ext_cx).into_iter()).collect(); + }).chain(Some(stmt_let_ext_cx)).collect(); cx.expr_block(cx.block_all(sp, stmts, Some(expr))) } |
