From d5d7e6565a4034b93d19be1edafd20730a4276bc Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 31 Jan 2015 12:20:46 -0500 Subject: `for x in xs.iter()` -> `for x in &xs` --- src/libsyntax/ast_map/mod.rs | 12 ++-- src/libsyntax/ast_util.rs | 12 ++-- src/libsyntax/attr.rs | 6 +- src/libsyntax/codemap.rs | 4 +- src/libsyntax/diagnostic.rs | 4 +- src/libsyntax/ext/deriving/generic/mod.rs | 4 +- src/libsyntax/ext/deriving/hash.rs | 2 +- src/libsyntax/ext/deriving/primitive.rs | 2 +- src/libsyntax/ext/expand.rs | 12 ++-- src/libsyntax/ext/format.rs | 4 +- src/libsyntax/ext/quote.rs | 2 +- src/libsyntax/ext/tt/macro_parser.rs | 6 +- src/libsyntax/ext/tt/macro_rules.rs | 2 +- src/libsyntax/feature_gate.rs | 6 +- src/libsyntax/parse/lexer/comments.rs | 4 +- src/libsyntax/parse/lexer/mod.rs | 2 +- src/libsyntax/parse/mod.rs | 2 +- src/libsyntax/parse/parser.rs | 4 +- src/libsyntax/print/pprust.rs | 82 ++++++++++++------------ src/libsyntax/util/interner.rs | 4 +- src/libsyntax/visit.rs | 100 +++++++++++++++--------------- 21 files changed, 138 insertions(+), 138 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast_map/mod.rs b/src/libsyntax/ast_map/mod.rs index 8546e03cc87..5535e5911e0 100644 --- a/src/libsyntax/ast_map/mod.rs +++ b/src/libsyntax/ast_map/mod.rs @@ -730,7 +730,7 @@ impl<'ast> NodeCollector<'ast> { } fn visit_fn_decl(&mut self, decl: &'ast FnDecl) { - for a in decl.inputs.iter() { + for a in &decl.inputs { self.insert(a.id, NodeArg(&*a.pat)); } } @@ -743,7 +743,7 @@ impl<'ast> Visitor<'ast> for NodeCollector<'ast> { self.parent = i.id; match i.node { ItemImpl(_, _, _, _, _, ref impl_items) => { - for impl_item in impl_items.iter() { + for impl_item in impl_items { match *impl_item { MethodImplItem(ref m) => { self.insert(m.id, NodeImplItem(impl_item)); @@ -755,12 +755,12 @@ impl<'ast> Visitor<'ast> for NodeCollector<'ast> { } } ItemEnum(ref enum_definition, _) => { - for v in enum_definition.variants.iter() { + for v in &enum_definition.variants { self.insert(v.node.id, NodeVariant(&**v)); } } ItemForeignMod(ref nm) => { - for nitem in nm.items.iter() { + for nitem in &nm.items { self.insert(nitem.id, NodeForeignItem(&**nitem)); } } @@ -774,13 +774,13 @@ impl<'ast> Visitor<'ast> for NodeCollector<'ast> { } } ItemTrait(_, _, ref bounds, ref trait_items) => { - for b in bounds.iter() { + for b in &**bounds { if let TraitTyParamBound(ref t, TraitBoundModifier::None) = *b { self.insert(t.trait_ref.ref_id, NodeItem(i)); } } - for tm in trait_items.iter() { + for tm in trait_items { match *tm { RequiredMethod(ref m) => { self.insert(m.id, NodeTraitItem(tm)); diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 7f1264ac9a1..8fc9012829b 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -302,7 +302,7 @@ pub fn split_trait_methods(trait_methods: &[TraitItem]) -> (Vec, Vec> ) { let mut reqd = Vec::new(); let mut provd = Vec::new(); - for trt_method in trait_methods.iter() { + for trt_method in trait_methods { match *trt_method { RequiredMethod(ref tm) => reqd.push((*tm).clone()), ProvidedMethod(ref m) => provd.push((*m).clone()), @@ -391,10 +391,10 @@ pub struct IdVisitor<'a, O:'a> { impl<'a, O: IdVisitingOperation> IdVisitor<'a, O> { fn visit_generics_helper(&mut self, generics: &Generics) { - for type_parameter in generics.ty_params.iter() { + for type_parameter in &*generics.ty_params { self.operation.visit_id(type_parameter.id) } - for lifetime in generics.lifetimes.iter() { + for lifetime in &generics.lifetimes { self.operation.visit_id(lifetime.lifetime.id) } } @@ -430,14 +430,14 @@ impl<'a, 'v, O: IdVisitingOperation> Visitor<'v> for IdVisitor<'a, O> { ViewPathSimple(_, _) | ViewPathGlob(_) => {} ViewPathList(_, ref paths) => { - for path in paths.iter() { + for path in paths { self.operation.visit_id(path.node.id()) } } } } ItemEnum(ref enum_definition, _) => { - for variant in enum_definition.variants.iter() { + for variant in &enum_definition.variants { self.operation.visit_id(variant.node.id) } } @@ -511,7 +511,7 @@ impl<'a, 'v, O: IdVisitingOperation> Visitor<'v> for IdVisitor<'a, O> { visit::FkFnBlock => {} } - for argument in function_declaration.inputs.iter() { + for argument in &function_declaration.inputs { self.operation.visit_id(argument.id) } diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 4427a7aaf02..61ddd240abc 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -394,7 +394,7 @@ fn find_stability_generic<'a, let mut feature = None; let mut since = None; let mut reason = None; - for meta in metas.iter() { + for meta in metas { if meta.name().get() == "feature" { match meta.value_str() { Some(v) => feature = Some(v), @@ -496,7 +496,7 @@ pub fn find_stability(diagnostic: &SpanHandler, attrs: &[Attribute], pub fn require_unique_names(diagnostic: &SpanHandler, metas: &[P]) { let mut set = HashSet::new(); - for meta in metas.iter() { + for meta in metas { let name = meta.name(); if !set.insert(name.clone()) { @@ -518,7 +518,7 @@ pub fn find_repr_attrs(diagnostic: &SpanHandler, attr: &Attribute) -> Vec { mark_used(attr); - for item in items.iter() { + for item in items { match item.node { ast::MetaWord(ref word) => { let hint = match word.get() { diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index 8adb9b24222..bd7a7783580 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -453,7 +453,7 @@ impl CodeMap { } pub fn get_filemap(&self, filename: &str) -> Rc { - for fm in self.files.borrow().iter() { + for fm in &*self.files.borrow() { if filename == fm.name { return fm.clone(); } @@ -477,7 +477,7 @@ impl CodeMap { // The number of extra bytes due to multibyte chars in the FileMap let mut total_extra_bytes = 0; - for mbc in map.multibyte_chars.borrow().iter() { + for mbc in &*map.multibyte_chars.borrow() { debug!("{}-byte char at {:?}", mbc.bytes, mbc.pos); if mbc.pos < bpos { // every character is at least one byte, so we only diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs index 821ac8e2f89..19c4c3cabfc 100644 --- a/src/libsyntax/diagnostic.rs +++ b/src/libsyntax/diagnostic.rs @@ -461,7 +461,7 @@ fn highlight_lines(err: &mut EmitterWriter, elided = true; } // Print the offending lines - for &line_number in display_lines.iter() { + for &line_number in display_lines { if let Some(line) = fm.get_line(line_number) { try!(write!(&mut err.dst, "{}:{} {}\n", fm.name, line_number + 1, line)); @@ -550,7 +550,7 @@ fn custom_highlight_lines(w: &mut EmitterWriter, last_line_number + 1, last_line)); } } else { - for &line_number in lines.iter() { + for &line_number in lines { if let Some(line) = fm.get_line(line_number) { try!(write!(&mut w.dst, "{}:{} {}\n", fm.name, line_number + 1, line)); diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index 1b84d93738d..39c67c60511 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -427,7 +427,7 @@ impl<'a> TraitDef<'a> { bounds.push(cx.typarambound(trait_path.clone())); // also add in any bounds from the declaration - for declared_bound in ty_param.bounds.iter() { + for declared_bound in &*ty_param.bounds { bounds.push((*declared_bound).clone()); } @@ -974,7 +974,7 @@ impl<'a> MethodDef<'a> { subpats.push(p); idents }; - for self_arg_name in self_arg_names.tail().iter() { + for self_arg_name in self_arg_names.tail() { let (p, idents) = mk_self_pat(cx, &self_arg_name[]); subpats.push(p); self_pats_idents.push(idents); diff --git a/src/libsyntax/ext/deriving/hash.rs b/src/libsyntax/ext/deriving/hash.rs index e7f546b2691..efd93226618 100644 --- a/src/libsyntax/ext/deriving/hash.rs +++ b/src/libsyntax/ext/deriving/hash.rs @@ -100,7 +100,7 @@ fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) _ => cx.span_bug(trait_span, "impossible substructure in `derive(Hash)`") }; - for &FieldInfo { ref self_, span, .. } in fields.iter() { + for &FieldInfo { ref self_, span, .. } in fields { stmts.push(call_hash(span, self_.clone())); } diff --git a/src/libsyntax/ext/deriving/primitive.rs b/src/libsyntax/ext/deriving/primitive.rs index c694b054ba3..ae7b20f7853 100644 --- a/src/libsyntax/ext/deriving/primitive.rs +++ b/src/libsyntax/ext/deriving/primitive.rs @@ -93,7 +93,7 @@ fn cs_from(name: &str, cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure let mut arms = Vec::new(); - for variant in enum_def.variants.iter() { + for variant in &enum_def.variants { match variant.node.kind { ast::TupleVariantKind(ref args) => { if !args.is_empty() { diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 5736400313e..8b4816f5d2b 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -504,7 +504,7 @@ fn expand_item_modifiers(mut it: P, fld: &mut MacroExpander) return it.expect_item(); } - for attr in modifiers.iter() { + for attr in &modifiers { let mname = attr.name(); match fld.cx.syntax_env.find(&intern(mname.get())) { @@ -552,7 +552,7 @@ fn expand_item_underscore(item: ast::Item_, fld: &mut MacroExpander) -> ast::Ite // does this attribute list contain "macro_use" ? fn contains_macro_use(fld: &mut MacroExpander, attrs: &[ast::Attribute]) -> bool { - for attr in attrs.iter() { + for attr in attrs { let mut is_use = attr.check_name("macro_use"); if attr.check_name("macro_escape") { fld.cx.span_warn(attr.span, "macro_escape is a deprecated synonym for macro_use"); @@ -853,7 +853,7 @@ impl<'v> Visitor<'v> for PatIdentFinder { ast::Pat { id: _, node: ast::PatIdent(_, ref path1, ref inner), span: _ } => { self.ident_accumulator.push(path1.node); // visit optional subpattern of PatIdent: - for subpat in inner.iter() { + if let Some(ref subpat) = *inner { self.visit_pat(&**subpat) } } @@ -873,7 +873,7 @@ fn pattern_bindings(pat: &ast::Pat) -> Vec { /// find the PatIdent paths in a fn fn_decl_arg_bindings(fn_decl: &ast::FnDecl) -> Vec { let mut pat_idents = PatIdentFinder{ident_accumulator:Vec::new()}; - for arg in fn_decl.inputs.iter() { + for arg in &fn_decl.inputs { pat_idents.visit_pat(&*arg.pat); } pat_idents.ident_accumulator @@ -1063,7 +1063,7 @@ fn expand_annotatable(a: Annotatable, let mut decorator_items = SmallVector::zero(); let mut new_attrs = Vec::new(); - for attr in a.attrs().iter() { + for attr in a.attrs() { let mname = attr.name(); match fld.cx.syntax_env.find(&intern(mname.get())) { @@ -1218,7 +1218,7 @@ fn expand_item_multi_modifier(mut it: Annotatable, return it } - for attr in modifiers.iter() { + for attr in &modifiers { let mname = attr.name(); match fld.cx.syntax_env.find(&intern(mname.get())) { diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 36dbf117604..16aaccb0207 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -499,7 +499,7 @@ impl<'a, 'b> Context<'a, 'b> { self.ecx.expr_ident(e.span, name))); heads.push(self.ecx.expr_addr_of(e.span, e)); } - for name in self.name_ordering.iter() { + for name in &self.name_ordering { let e = match self.names.remove(name) { Some(e) => e, None => continue @@ -706,7 +706,7 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt, sp: Span, cx.ecx.span_err(cx.args[i].span, "argument never used"); } } - for (name, e) in cx.names.iter() { + for (name, e) in &cx.names { if !cx.name_types.contains_key(name) { cx.ecx.span_err(e.span, "named argument never used"); } diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 0f617302c92..e9c6629be3c 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -694,7 +694,7 @@ fn mk_tt(cx: &ExtCtxt, tt: &ast::TokenTree) -> Vec> { fn mk_tts(cx: &ExtCtxt, tts: &[ast::TokenTree]) -> Vec> { let mut ss = Vec::new(); - for tt in tts.iter() { + for tt in tts { ss.extend(mk_tt(cx, tt).into_iter()); } ss diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index e3211c7c337..ac4a149a3ed 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -209,12 +209,12 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc]) ret_val: &mut HashMap>, idx: &mut usize) { match m { &TtSequence(_, ref seq) => { - for next_m in seq.tts.iter() { + for next_m in &seq.tts { n_rec(p_s, next_m, res, ret_val, idx) } } &TtDelimited(_, ref delim) => { - for next_m in delim.tts.iter() { + for next_m in &delim.tts { n_rec(p_s, next_m, res, ret_val, idx) } } @@ -239,7 +239,7 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc]) } let mut ret_val = HashMap::new(); let mut idx = 0us; - for m in ms.iter() { n_rec(p_s, m, res, &mut ret_val, &mut idx) } + for m in ms { n_rec(p_s, m, res, &mut ret_val, &mut idx) } ret_val } diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 666281ac6b6..ac9f375e0a4 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -259,7 +259,7 @@ pub fn compile<'cx>(cx: &'cx mut ExtCtxt, _ => cx.span_bug(def.span, "wrong-structured lhs") }; - for lhs in lhses.iter() { + for lhs in &lhses { check_lhs_nt_follows(cx, &**lhs, def.span); } diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 775cfede70d..4e76359e930 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -253,7 +253,7 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> { } fn visit_item(&mut self, i: &ast::Item) { - for attr in i.attrs.iter() { + for attr in &i.attrs { if attr.name() == "thread_local" { self.gate_feature("thread_local", i.span, "`#[thread_local]` is an experimental feature, and does not \ @@ -508,7 +508,7 @@ fn check_crate_inner(cm: &CodeMap, span_handler: &SpanHandler, krate: &ast::C let mut unknown_features = Vec::new(); - for attr in krate.attrs.iter() { + for attr in &krate.attrs { if !attr.check_name("feature") { continue } @@ -519,7 +519,7 @@ fn check_crate_inner(cm: &CodeMap, span_handler: &SpanHandler, krate: &ast::C expected #![feature(...)]"); } Some(list) => { - for mi in list.iter() { + for mi in list { let name = match mi.node { ast::MetaWord(ref word) => (*word).clone(), _ => { diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs index 926385ccd11..7269afcaea4 100644 --- a/src/libsyntax/parse/lexer/comments.rs +++ b/src/libsyntax/parse/lexer/comments.rs @@ -90,7 +90,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> String { let mut i = usize::MAX; let mut can_trim = true; let mut first = true; - for line in lines.iter() { + for line in &lines { for (j, c) in line.chars().enumerate() { if j > i || !"* \t".contains_char(c) { can_trim = false; @@ -125,7 +125,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> String { // one-line comments lose their prefix static ONLINERS: &'static [&'static str] = &["///!", "///", "//!", "//"]; - for prefix in ONLINERS.iter() { + for prefix in ONLINERS { if comment.starts_with(*prefix) { return (&comment[prefix.len()..]).to_string(); } diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 2cf6058a433..ca6193508fe 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1526,7 +1526,7 @@ mod test { // check that the given reader produces the desired stream // of tokens (stop checking after exhausting the expected vec) fn check_tokenization (mut string_reader: StringReader, expected: Vec ) { - for expected_tok in expected.iter() { + for expected_tok in &expected { assert_eq!(&string_reader.next_token().tok, expected_tok); } } diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 8ac5b6e5274..81803d6bd89 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -1163,7 +1163,7 @@ mod test { "impl z { fn a (self: Foo, &myarg: i32) {} }", ]; - for &src in srcs.iter() { + for &src in &srcs { let spans = get_spans_of_pat_idents(src); let Span{ lo, hi, .. } = spans[0]; assert!("self" == &src[lo.to_usize()..hi.to_usize()], diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d99095eeba3..b7960d9e709 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2706,7 +2706,7 @@ impl<'a> Parser<'a> { match self.token { token::Eof => { let open_braces = self.open_braces.clone(); - for sp in open_braces.iter() { + for sp in &open_braces { self.span_help(*sp, "did you mean to close this delimiter?"); } // There shouldn't really be a span, but it's easier for the test runner @@ -5200,7 +5200,7 @@ impl<'a> Parser<'a> { Some(i) => { let mut err = String::from_str("circular modules: "); let len = included_mod_stack.len(); - for p in included_mod_stack[i.. len].iter() { + for p in &included_mod_stack[i.. len] { err.push_str(&p.display().as_cow()[]); err.push_str(" -> "); } diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 5367ccc1357..21cd02b3851 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -593,7 +593,7 @@ impl<'a> State<'a> { { try!(self.rbox(0us, b)); let mut first = true; - for elt in elts.iter() { + for elt in elts { if first { first = false; } else { try!(self.word_space(",")); } try!(op(self, elt)); } @@ -612,7 +612,7 @@ impl<'a> State<'a> { try!(self.rbox(0us, b)); let len = elts.len(); let mut i = 0us; - for elt in elts.iter() { + for elt in elts { try!(self.maybe_print_comment(get_span(elt).hi)); try!(op(self, elt)); i += 1us; @@ -634,7 +634,7 @@ impl<'a> State<'a> { pub fn print_mod(&mut self, _mod: &ast::Mod, attrs: &[ast::Attribute]) -> IoResult<()> { try!(self.print_inner_attributes(attrs)); - for item in _mod.items.iter() { + for item in &_mod.items { try!(self.print_item(&**item)); } Ok(()) @@ -643,7 +643,7 @@ impl<'a> State<'a> { pub fn print_foreign_mod(&mut self, nmod: &ast::ForeignMod, attrs: &[ast::Attribute]) -> IoResult<()> { try!(self.print_inner_attributes(attrs)); - for item in nmod.items.iter() { + for item in &nmod.items { try!(self.print_foreign_item(&**item)); } Ok(()) @@ -651,8 +651,8 @@ impl<'a> State<'a> { pub fn print_opt_lifetime(&mut self, lifetime: &Option) -> IoResult<()> { - for l in lifetime.iter() { - try!(self.print_lifetime(l)); + if let Some(l) = *lifetime { + try!(self.print_lifetime(&l)); try!(self.nbsp()); } Ok(()) @@ -799,7 +799,7 @@ impl<'a> State<'a> { ast::ItemExternCrate(ref optional_path) => { try!(self.head(&visibility_qualified(item.vis, "extern crate")[])); - for &(ref p, style) in optional_path.iter() { + if let Some((ref p, style)) = *optional_path { try!(self.print_string(p.get(), style)); try!(space(&mut self.s)); try!(word(&mut self.s, "as")); @@ -945,7 +945,7 @@ impl<'a> State<'a> { try!(space(&mut self.s)); try!(self.bopen()); try!(self.print_inner_attributes(&item.attrs[])); - for impl_item in impl_items.iter() { + for impl_item in impl_items { match *impl_item { ast::MethodImplItem(ref meth) => { try!(self.print_method(&**meth)); @@ -979,7 +979,7 @@ impl<'a> State<'a> { try!(self.print_where_clause(generics)); try!(word(&mut self.s, " ")); try!(self.bopen()); - for meth in methods.iter() { + for meth in methods { try!(self.print_trait_method(meth)); } try!(self.bclose(item.span)); @@ -1010,7 +1010,7 @@ impl<'a> State<'a> { if !t.bound_lifetimes.is_empty() { try!(word(&mut self.s, "for<")); let mut comma = false; - for lifetime_def in t.bound_lifetimes.iter() { + for lifetime_def in &t.bound_lifetimes { if comma { try!(self.word_space(",")) } @@ -1039,7 +1039,7 @@ impl<'a> State<'a> { variants: &[P], span: codemap::Span) -> IoResult<()> { try!(self.bopen()); - for v in variants.iter() { + for v in variants { try!(self.space_if_not_bol()); try!(self.maybe_print_comment(v.span.lo)); try!(self.print_outer_attributes(&v.node.attrs[])); @@ -1094,7 +1094,7 @@ impl<'a> State<'a> { try!(self.bopen()); try!(self.hardbreak_if_not_bol()); - for field in struct_def.fields.iter() { + for field in &struct_def.fields { match field.node.kind { ast::UnnamedField(..) => panic!("unexpected unnamed field"), ast::NamedField(ident, visibility) => { @@ -1141,7 +1141,7 @@ impl<'a> State<'a> { }, ast::TtSequence(_, ref seq) => { try!(word(&mut self.s, "$(")); - for tt_elt in seq.tts.iter() { + for tt_elt in &seq.tts { try!(self.print_tt(tt_elt)); } try!(word(&mut self.s, ")")); @@ -1278,7 +1278,7 @@ impl<'a> State<'a> { pub fn print_outer_attributes(&mut self, attrs: &[ast::Attribute]) -> IoResult<()> { let mut count = 0us; - for attr in attrs.iter() { + for attr in attrs { match attr.node.style { ast::AttrOuter => { try!(self.print_attribute(attr)); @@ -1296,7 +1296,7 @@ impl<'a> State<'a> { pub fn print_inner_attributes(&mut self, attrs: &[ast::Attribute]) -> IoResult<()> { let mut count = 0us; - for attr in attrs.iter() { + for attr in attrs { match attr.node.style { ast::AttrInner => { try!(self.print_attribute(attr)); @@ -1395,7 +1395,7 @@ impl<'a> State<'a> { try!(self.print_inner_attributes(attrs)); - for st in blk.stmts.iter() { + for st in &blk.stmts { try!(self.print_stmt(&**st)); } match blk.expr { @@ -1691,8 +1691,8 @@ impl<'a> State<'a> { try!(self.print_if_let(&**pat, &**expr, &** blk, elseopt.as_ref().map(|e| &**e))); } ast::ExprWhile(ref test, ref blk, opt_ident) => { - for ident in opt_ident.iter() { - try!(self.print_ident(*ident)); + if let Some(ident) = opt_ident { + try!(self.print_ident(ident)); try!(self.word_space(":")); } try!(self.head("while")); @@ -1701,8 +1701,8 @@ impl<'a> State<'a> { try!(self.print_block(&**blk)); } ast::ExprWhileLet(ref pat, ref expr, ref blk, opt_ident) => { - for ident in opt_ident.iter() { - try!(self.print_ident(*ident)); + if let Some(ident) = opt_ident { + try!(self.print_ident(ident)); try!(self.word_space(":")); } try!(self.head("while let")); @@ -1714,8 +1714,8 @@ impl<'a> State<'a> { try!(self.print_block(&**blk)); } ast::ExprForLoop(ref pat, ref iter, ref blk, opt_ident) => { - for ident in opt_ident.iter() { - try!(self.print_ident(*ident)); + if let Some(ident) = opt_ident { + try!(self.print_ident(ident)); try!(self.word_space(":")); } try!(self.head("for")); @@ -1727,8 +1727,8 @@ impl<'a> State<'a> { try!(self.print_block(&**blk)); } ast::ExprLoop(ref blk, opt_ident) => { - for ident in opt_ident.iter() { - try!(self.print_ident(*ident)); + if let Some(ident) = opt_ident { + try!(self.print_ident(ident)); try!(self.word_space(":")); } try!(self.head("loop")); @@ -1742,7 +1742,7 @@ impl<'a> State<'a> { try!(self.print_expr(&**expr)); try!(space(&mut self.s)); try!(self.bopen()); - for arm in arms.iter() { + for arm in arms { try!(self.print_arm(arm)); } try!(self.bclose_(expr.span, indent_unit)); @@ -1825,16 +1825,16 @@ impl<'a> State<'a> { ast::ExprBreak(opt_ident) => { try!(word(&mut self.s, "break")); try!(space(&mut self.s)); - for ident in opt_ident.iter() { - try!(self.print_ident(*ident)); + if let Some(ident) = opt_ident { + try!(self.print_ident(ident)); try!(space(&mut self.s)); } } ast::ExprAgain(opt_ident) => { try!(word(&mut self.s, "continue")); try!(space(&mut self.s)); - for ident in opt_ident.iter() { - try!(self.print_ident(*ident)); + if let Some(ident) = opt_ident { + try!(self.print_ident(ident)); try!(space(&mut self.s)) } } @@ -1991,7 +1991,7 @@ impl<'a> State<'a> { } let mut first = true; - for segment in path.segments.iter() { + for segment in &path.segments { if first { first = false } else { @@ -2040,7 +2040,7 @@ impl<'a> State<'a> { try!(word(&mut self.s, "<")); let mut comma = false; - for lifetime in data.lifetimes.iter() { + for lifetime in &data.lifetimes { if comma { try!(self.word_space(",")) } @@ -2059,7 +2059,7 @@ impl<'a> State<'a> { comma = true; } - for binding in data.bindings.iter() { + for binding in &*data.bindings { if comma { try!(self.word_space(",")) } @@ -2193,7 +2193,7 @@ impl<'a> State<'a> { try!(self.commasep(Inconsistent, &before[], |s, p| s.print_pat(&**p))); - for p in slice.iter() { + if let Some(ref p) = *slice { if !before.is_empty() { try!(self.word_space(",")); } try!(self.print_pat(&**p)); match **p { @@ -2224,7 +2224,7 @@ impl<'a> State<'a> { try!(self.ibox(0us)); try!(self.print_outer_attributes(&arm.attrs[])); let mut first = true; - for p in arm.pats.iter() { + for p in &arm.pats { if first { first = false; } else { @@ -2309,7 +2309,7 @@ impl<'a> State<'a> { // self type and the args all in the same box. try!(self.rbox(0us, Inconsistent)); let mut first = true; - for &explicit_self in opt_explicit_self.iter() { + if let Some(explicit_self) = opt_explicit_self { let m = match explicit_self { &ast::SelfStatic => ast::MutImmutable, _ => match decl.inputs[0].pat.node { @@ -2327,7 +2327,7 @@ impl<'a> State<'a> { &decl.inputs[1..] }; - for arg in args.iter() { + for arg in args { if first { first = false; } else { try!(self.word_space(",")); } try!(self.print_arg(arg)); } @@ -2397,7 +2397,7 @@ impl<'a> State<'a> { if !bounds.is_empty() { try!(word(&mut self.s, prefix)); let mut first = true; - for bound in bounds.iter() { + for bound in bounds { try!(self.nbsp()); if first { first = false; @@ -2437,7 +2437,7 @@ impl<'a> State<'a> { { try!(self.print_lifetime(&lifetime.lifetime)); let mut sep = ":"; - for v in lifetime.bounds.iter() { + for v in &lifetime.bounds { try!(word(&mut self.s, sep)); try!(self.print_lifetime(v)); sep = "+"; @@ -2792,7 +2792,7 @@ impl<'a> State<'a> { } ast::LitBinary(ref v) => { let mut escaped: String = String::new(); - for &ch in v.iter() { + for &ch in &**v { ascii::escape_default(ch as u8, |ch| escaped.push(ch as char)); } @@ -2842,7 +2842,7 @@ impl<'a> State<'a> { } comments::Isolated => { try!(self.hardbreak_if_not_bol()); - for line in cmnt.lines.iter() { + for line in &cmnt.lines { // Don't print empty lines because they will end up as trailing // whitespace if !line.is_empty() { @@ -2859,7 +2859,7 @@ impl<'a> State<'a> { hardbreak(&mut self.s) } else { try!(self.ibox(0us)); - for line in cmnt.lines.iter() { + for line in &cmnt.lines { if !line.is_empty() { try!(word(&mut self.s, &line[])); } diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs index 1b35b1b04a3..51144267519 100644 --- a/src/libsyntax/util/interner.rs +++ b/src/libsyntax/util/interner.rs @@ -40,7 +40,7 @@ impl + Clone + 'static> Interner { pub fn prefill(init: &[T]) -> Interner { let rv = Interner::new(); - for v in init.iter() { + for v in init { rv.intern((*v).clone()); } rv @@ -158,7 +158,7 @@ impl StrInterner { pub fn prefill(init: &[&str]) -> StrInterner { let rv = StrInterner::new(); - for &v in init.iter() { rv.intern(v); } + for &v in init { rv.intern(v); } rv } diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index eb906788aa7..bd84306fe17 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -159,13 +159,13 @@ pub fn walk_inlined_item<'v,V>(visitor: &mut V, item: &'v InlinedItem) pub fn walk_crate<'v, V: Visitor<'v>>(visitor: &mut V, krate: &'v Crate) { visitor.visit_mod(&krate.module, krate.span, CRATE_NODE_ID); - for attr in krate.attrs.iter() { + for attr in &krate.attrs { visitor.visit_attribute(attr); } } pub fn walk_mod<'v, V: Visitor<'v>>(visitor: &mut V, module: &'v Mod) { - for item in module.items.iter() { + for item in &module.items { visitor.visit_item(&**item) } } @@ -179,7 +179,7 @@ pub fn walk_local<'v, V: Visitor<'v>>(visitor: &mut V, local: &'v Local) { pub fn walk_lifetime_def<'v, V: Visitor<'v>>(visitor: &mut V, lifetime_def: &'v LifetimeDef) { visitor.visit_name(lifetime_def.lifetime.span, lifetime_def.lifetime.name); - for bound in lifetime_def.bounds.iter() { + for bound in &lifetime_def.bounds { visitor.visit_lifetime_bound(bound); } } @@ -239,7 +239,7 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) { visitor.visit_path(path, item.id); } ViewPathList(ref prefix, ref list) => { - for id in list.iter() { + for id in list { match id.node { PathListIdent { name, .. } => { visitor.visit_ident(id.span, name); @@ -270,7 +270,7 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) { visitor.visit_mod(module, item.span, item.id) } ItemForeignMod(ref foreign_module) => { - for foreign_item in foreign_module.items.iter() { + for foreign_item in &foreign_module.items { visitor.visit_foreign_item(&**foreign_item) } } @@ -293,7 +293,7 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) { None => () } visitor.visit_ty(&**typ); - for impl_item in impl_items.iter() { + for impl_item in impl_items { match *impl_item { MethodImplItem(ref method) => { walk_method_helper(visitor, &**method) @@ -315,13 +315,13 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) { ItemTrait(_, ref generics, ref bounds, ref methods) => { visitor.visit_generics(generics); walk_ty_param_bounds_helper(visitor, bounds); - for method in methods.iter() { + for method in methods { visitor.visit_trait_item(method) } } ItemMac(ref mac) => visitor.visit_mac(mac), } - for attr in item.attrs.iter() { + for attr in &item.attrs { visitor.visit_attribute(attr); } } @@ -329,7 +329,7 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) { pub fn walk_enum_def<'v, V: Visitor<'v>>(visitor: &mut V, enum_definition: &'v EnumDef, generics: &'v Generics) { - for variant in enum_definition.variants.iter() { + for variant in &enum_definition.variants { visitor.visit_variant(&**variant, generics); } } @@ -341,7 +341,7 @@ pub fn walk_variant<'v, V: Visitor<'v>>(visitor: &mut V, match variant.node.kind { TupleVariantKind(ref variant_arguments) => { - for variant_argument in variant_arguments.iter() { + for variant_argument in variant_arguments { visitor.visit_ty(&*variant_argument.ty) } } @@ -356,7 +356,7 @@ pub fn walk_variant<'v, V: Visitor<'v>>(visitor: &mut V, Some(ref expr) => visitor.visit_expr(&**expr), None => () } - for attr in variant.node.attrs.iter() { + for attr in &variant.node.attrs { visitor.visit_attribute(attr); } } @@ -385,12 +385,12 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty) { visitor.visit_ty(&*mutable_type.ty) } TyTup(ref tuple_element_types) => { - for tuple_element_type in tuple_element_types.iter() { + for tuple_element_type in tuple_element_types { visitor.visit_ty(&**tuple_element_type) } } TyBareFn(ref function_declaration) => { - for argument in function_declaration.decl.inputs.iter() { + for argument in &function_declaration.decl.inputs { visitor.visit_ty(&*argument.ty) } walk_fn_ret_ty(visitor, &function_declaration.decl.output); @@ -422,13 +422,13 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty) { pub fn walk_lifetime_decls_helper<'v, V: Visitor<'v>>(visitor: &mut V, lifetimes: &'v Vec) { - for l in lifetimes.iter() { + for l in lifetimes { visitor.visit_lifetime_def(l); } } pub fn walk_path<'v, V: Visitor<'v>>(visitor: &mut V, path: &'v Path) { - for segment in path.segments.iter() { + for segment in &path.segments { visitor.visit_path_segment(path.span, segment); } } @@ -453,21 +453,21 @@ pub fn walk_path_parameters<'v, V: Visitor<'v>>(visitor: &mut V, path_parameters: &'v PathParameters) { match *path_parameters { ast::AngleBracketedParameters(ref data) => { - for typ in data.types.iter() { + for typ in &*data.types { visitor.visit_ty(&**typ); } - for lifetime in data.lifetimes.iter() { + for lifetime in &data.lifetimes { visitor.visit_lifetime_ref(lifetime); } - for binding in data.bindings.iter() { + for binding in &*data.bindings { visitor.visit_assoc_type_binding(&**binding); } } ast::ParenthesizedParameters(ref data) => { - for typ in data.inputs.iter() { + for typ in &data.inputs { visitor.visit_ty(&**typ); } - for typ in data.output.iter() { + if let Some(ref typ) = data.output { visitor.visit_ty(&**typ); } } @@ -484,20 +484,20 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat) { match pattern.node { PatEnum(ref path, ref children) => { visitor.visit_path(path, pattern.id); - for children in children.iter() { - for child in children.iter() { - visitor.visit_pat(&**child) + if let Some(ref children) = *children { + for child in children { + visitor.visit_pat(&*child) } } } PatStruct(ref path, ref fields, _) => { visitor.visit_path(path, pattern.id); - for field in fields.iter() { + for field in fields { visitor.visit_pat(&*field.node.pat) } } PatTup(ref tuple_elements) => { - for tuple_element in tuple_elements.iter() { + for tuple_element in tuple_elements { visitor.visit_pat(&**tuple_element) } } @@ -519,13 +519,13 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat) { } PatWild(_) => (), PatVec(ref prepattern, ref slice_pattern, ref postpatterns) => { - for prepattern in prepattern.iter() { + for prepattern in prepattern { visitor.visit_pat(&**prepattern) } - for slice_pattern in slice_pattern.iter() { + if let Some(ref slice_pattern) = *slice_pattern { visitor.visit_pat(&**slice_pattern) } - for postpattern in postpatterns.iter() { + for postpattern in postpatterns { visitor.visit_pat(&**postpattern) } } @@ -545,14 +545,14 @@ pub fn walk_foreign_item<'v, V: Visitor<'v>>(visitor: &mut V, ForeignItemStatic(ref typ, _) => visitor.visit_ty(&**typ), } - for attr in foreign_item.attrs.iter() { + for attr in &foreign_item.attrs { visitor.visit_attribute(attr); } } pub fn walk_ty_param_bounds_helper<'v, V: Visitor<'v>>(visitor: &mut V, bounds: &'v OwnedSlice) { - for bound in bounds.iter() { + for bound in &**bounds { visitor.visit_ty_param_bound(bound) } } @@ -576,11 +576,11 @@ pub fn walk_ty_param<'v, V: Visitor<'v>>(visitor: &mut V, param: &'v TyParam) { } pub fn walk_generics<'v, V: Visitor<'v>>(visitor: &mut V, generics: &'v Generics) { - for type_parameter in generics.ty_params.iter() { + for type_parameter in &*generics.ty_params { walk_ty_param(visitor, type_parameter); } walk_lifetime_decls_helper(visitor, &generics.lifetimes); - for predicate in generics.where_clause.predicates.iter() { + for predicate in &generics.where_clause.predicates { match predicate { &ast::WherePredicate::BoundPredicate(ast::WhereBoundPredicate{ref bounded_ty, ref bounds, @@ -593,7 +593,7 @@ pub fn walk_generics<'v, V: Visitor<'v>>(visitor: &mut V, generics: &'v Generics ..}) => { visitor.visit_lifetime_ref(lifetime); - for bound in bounds.iter() { + for bound in bounds { visitor.visit_lifetime_ref(bound); } } @@ -615,7 +615,7 @@ pub fn walk_fn_ret_ty<'v, V: Visitor<'v>>(visitor: &mut V, ret_ty: &'v FunctionR } pub fn walk_fn_decl<'v, V: Visitor<'v>>(visitor: &mut V, function_declaration: &'v FnDecl) { - for argument in function_declaration.inputs.iter() { + for argument in &function_declaration.inputs { visitor.visit_pat(&*argument.pat); visitor.visit_ty(&*argument.ty) } @@ -635,7 +635,7 @@ pub fn walk_method_helper<'v, V: Visitor<'v>>(visitor: &mut V, method: &'v Metho &**body, method.span, method.id); - for attr in method.attrs.iter() { + for attr in &method.attrs { visitor.visit_attribute(attr); } @@ -673,12 +673,12 @@ pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V, pub fn walk_ty_method<'v, V: Visitor<'v>>(visitor: &mut V, method_type: &'v TypeMethod) { visitor.visit_ident(method_type.span, method_type.ident); visitor.visit_explicit_self(&method_type.explicit_self); - for argument_type in method_type.decl.inputs.iter() { + for argument_type in &method_type.decl.inputs { visitor.visit_ty(&*argument_type.ty) } visitor.visit_generics(&method_type.generics); walk_fn_ret_ty(visitor, &method_type.decl.output); - for attr in method_type.attrs.iter() { + for attr in &method_type.attrs { visitor.visit_attribute(attr); } } @@ -695,7 +695,7 @@ pub fn walk_trait_item<'v, V: Visitor<'v>>(visitor: &mut V, trait_method: &'v Tr pub fn walk_struct_def<'v, V: Visitor<'v>>(visitor: &mut V, struct_definition: &'v StructDef) { - for field in struct_definition.fields.iter() { + for field in &struct_definition.fields { visitor.visit_struct_field(field) } } @@ -708,13 +708,13 @@ pub fn walk_struct_field<'v, V: Visitor<'v>>(visitor: &mut V, visitor.visit_ty(&*struct_field.node.ty); - for attr in struct_field.node.attrs.iter() { + for attr in &struct_field.node.attrs { visitor.visit_attribute(attr); } } pub fn walk_block<'v, V: Visitor<'v>>(visitor: &mut V, block: &'v Block) { - for statement in block.stmts.iter() { + for statement in &block.stmts { visitor.visit_stmt(&**statement) } walk_expr_opt(visitor, &block.expr) @@ -746,7 +746,7 @@ pub fn walk_expr_opt<'v, V: Visitor<'v>>(visitor: &mut V, } pub fn walk_exprs<'v, V: Visitor<'v>>(visitor: &mut V, expressions: &'v [P]) { - for expression in expressions.iter() { + for expression in expressions { visitor.visit_expr(&**expression) } } @@ -770,25 +770,25 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) { } ExprStruct(ref path, ref fields, ref optional_base) => { visitor.visit_path(path, expression.id); - for field in fields.iter() { + for field in fields { visitor.visit_expr(&*field.expr) } walk_expr_opt(visitor, optional_base) } ExprTup(ref subexpressions) => { - for subexpression in subexpressions.iter() { + for subexpression in subexpressions { visitor.visit_expr(&**subexpression) } } ExprCall(ref callee_expression, ref arguments) => { - for argument in arguments.iter() { + for argument in arguments { visitor.visit_expr(&**argument) } visitor.visit_expr(&**callee_expression) } ExprMethodCall(_, ref types, ref arguments) => { walk_exprs(visitor, arguments.as_slice()); - for typ in types.iter() { + for typ in types { visitor.visit_ty(&**typ) } } @@ -832,7 +832,7 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) { ExprLoop(ref block, _) => visitor.visit_block(&**block), ExprMatch(ref subexpression, ref arms, _) => { visitor.visit_expr(&**subexpression); - for arm in arms.iter() { + for arm in arms { visitor.visit_arm(arm) } } @@ -881,11 +881,11 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) { visitor.visit_expr(&**subexpression) } ExprInlineAsm(ref ia) => { - for input in ia.inputs.iter() { + for input in &ia.inputs { let (_, ref input) = *input; visitor.visit_expr(&**input) } - for output in ia.outputs.iter() { + for output in &ia.outputs { let (_, ref output, _) = *output; visitor.visit_expr(&**output) } @@ -896,12 +896,12 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) { } pub fn walk_arm<'v, V: Visitor<'v>>(visitor: &mut V, arm: &'v Arm) { - for pattern in arm.pats.iter() { + for pattern in &arm.pats { visitor.visit_pat(&**pattern) } walk_expr_opt(visitor, &arm.guard); visitor.visit_expr(&*arm.body); - for attr in arm.attrs.iter() { + for attr in &arm.attrs { visitor.visit_attribute(attr); } } -- cgit 1.4.1-3-g733a5 From d5f61b4332f3edd83c43f3f0d52d0381d7a6c37a Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 31 Jan 2015 20:02:00 -0500 Subject: `for x in xs.iter_mut()` -> `for x in &mut xs` Also `for x in option.iter_mut()` -> `if let Some(ref mut x) = option` --- src/libcollections/bit.rs | 6 +++--- src/libcollections/ring_buf.rs | 2 +- src/libcollections/slice.rs | 18 +++++++++--------- src/libcollections/vec.rs | 10 +++++----- src/libcollections/vec_map.rs | 2 +- src/libcore/iter.rs | 4 ++-- src/librand/chacha.rs | 2 +- src/librand/distributions/mod.rs | 2 +- src/librand/lib.rs | 2 +- src/librustc/lint/context.rs | 2 +- src/librustc/middle/dataflow.rs | 2 +- src/librustc/middle/infer/error_reporting.rs | 2 +- .../borrowck/gather_loans/move_error.rs | 2 +- src/librustc_trans/trans/cabi_x86_64.rs | 2 +- src/librustc_trans/trans/debuginfo.rs | 2 +- src/librustc_typeck/astconv.rs | 2 +- src/librustc_typeck/check/mod.rs | 2 +- src/librustc_typeck/rscope.rs | 2 +- src/librustdoc/clean/mod.rs | 2 +- src/librustdoc/html/render.rs | 2 +- src/libstd/ascii.rs | 4 ++-- src/libstd/old_io/net/ip.rs | 2 +- src/libstd/old_io/util.rs | 4 ++-- src/libsyntax/ext/tt/macro_parser.rs | 2 +- src/libsyntax/fold.rs | 4 ++-- src/libtest/lib.rs | 4 ++-- src/libtest/stats.rs | 2 +- src/test/bench/msgsend-ring-mutex-arcs.rs | 2 +- src/test/bench/noise.rs | 2 +- src/test/bench/shootout-meteor.rs | 4 ++-- src/test/bench/shootout-nbody.rs | 2 +- src/test/compile-fail/vec-mut-iter-borrow.rs | 2 +- src/test/run-pass/const-vec-of-fns.rs | 2 +- .../mutability-inherits-through-fixed-length-vec.rs | 2 +- 34 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs index 3d16dd4b166..da00b25bbbc 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -431,7 +431,7 @@ impl Bitv { /// ``` #[inline] pub fn set_all(&mut self) { - for w in self.storage.iter_mut() { *w = !0u32; } + for w in &mut self.storage { *w = !0u32; } self.fix_last_block(); } @@ -451,7 +451,7 @@ impl Bitv { /// ``` #[inline] pub fn negate(&mut self) { - for w in self.storage.iter_mut() { *w = !*w; } + for w in &mut self.storage { *w = !*w; } self.fix_last_block(); } @@ -912,7 +912,7 @@ impl Bitv { #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn clear(&mut self) { - for w in self.storage.iter_mut() { *w = 0u32; } + for w in &mut self.storage { *w = 0u32; } } } diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs index 4b9f3980db2..b7d16b864fd 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -1869,7 +1869,7 @@ mod tests { b.iter(|| { let mut sum = 0; - for i in ring.iter_mut() { + for i in &mut ring { sum += *i; } test::black_box(sum); diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 9be918dbe15..3830ab9ee7b 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -1228,7 +1228,7 @@ impl Iterator for ElementSwaps { self.sdir.swap(i, j); // Swap the direction of each larger SizeDirection - for x in self.sdir.iter_mut() { + for x in &mut self.sdir { if x.size > sd.size { x.dir = match x.dir { Pos => Neg, Neg => Pos }; } @@ -2356,7 +2356,7 @@ mod tests { #[test] fn test_mut_iterator() { let mut xs = [1, 2, 3, 4, 5]; - for x in xs.iter_mut() { + for x in &mut xs { *x += 1; } assert!(xs == [2, 3, 4, 5, 6]) @@ -2656,7 +2656,7 @@ mod tests { let left: &[_] = left; assert!(left[..left.len()] == [1, 2][]); } - for p in left.iter_mut() { + for p in left { *p += 1; } @@ -2664,7 +2664,7 @@ mod tests { let right: &[_] = right; assert!(right[..right.len()] == [3, 4, 5][]); } - for p in right.iter_mut() { + for p in right { *p += 2; } } @@ -2693,7 +2693,7 @@ mod tests { } assert_eq!(cnt, 5); - for f in v.iter_mut() { + for f in &mut v { assert!(*f == Foo); cnt += 1; } @@ -2796,7 +2796,7 @@ mod tests { let mut v = [0u8, 1, 2, 3, 4, 5, 6]; assert_eq!(v.chunks_mut(2).len(), 4); for (i, chunk) in v.chunks_mut(3).enumerate() { - for x in chunk.iter_mut() { + for x in chunk { *x = i as u8; } } @@ -2808,7 +2808,7 @@ mod tests { fn test_mut_chunks_rev() { let mut v = [0u8, 1, 2, 3, 4, 5, 6]; for (i, chunk) in v.chunks_mut(3).rev().enumerate() { - for x in chunk.iter_mut() { + for x in chunk { *x = i as u8; } } @@ -2872,7 +2872,7 @@ mod bench { b.iter(|| { let mut i = 0; - for x in v.iter_mut() { + for x in &mut v { *x = i; i += 1; } @@ -3006,7 +3006,7 @@ mod bench { unsafe { v.set_len(1024); } - for x in v.iter_mut() { + for x in &mut v { *x = 0; } v diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index e570d401609..acf4b480dfb 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -2022,7 +2022,7 @@ mod tests { { let slice = &mut values[2 ..]; assert!(slice == [3, 4, 5]); - for p in slice.iter_mut() { + for p in slice { *p += 2; } } @@ -2036,7 +2036,7 @@ mod tests { { let slice = &mut values[.. 2]; assert!(slice == [1, 2]); - for p in slice.iter_mut() { + for p in slice { *p += 1; } } @@ -2053,7 +2053,7 @@ mod tests { let left: &[_] = left; assert!(&left[..left.len()] == &[1, 2][]); } - for p in left.iter_mut() { + for p in left { *p += 1; } @@ -2061,7 +2061,7 @@ mod tests { let right: &[_] = right; assert!(&right[..right.len()] == &[3, 4, 5][]); } - for p in right.iter_mut() { + for p in right { *p += 2; } } @@ -2137,7 +2137,7 @@ mod tests { v.push(()); assert_eq!(v.iter_mut().count(), 4); - for &mut () in v.iter_mut() {} + for &mut () in &mut v {} unsafe { v.set_len(0); } assert_eq!(v.iter_mut().count(), 0); } diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index 1adea45f630..b07e172079e 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -924,7 +924,7 @@ mod test_map { assert!(m.insert(6, 10).is_none()); assert!(m.insert(10, 11).is_none()); - for (k, v) in m.iter_mut() { + for (k, v) in &mut m { *v += k as int; } diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index c782452d4cf..b6b6c52d568 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -2205,7 +2205,7 @@ impl Iterator for FlatMap where #[inline] fn next(&mut self) -> Option { loop { - for inner in self.frontiter.iter_mut() { + if let Some(ref mut inner) = self.frontiter { for x in inner.by_ref() { return Some(x) } @@ -2238,7 +2238,7 @@ impl DoubleEndedIterator for FlatMap where #[inline] fn next_back(&mut self) -> Option { loop { - for inner in self.backiter.iter_mut() { + if let Some(ref mut inner) = self.backiter { match inner.next_back() { None => (), y => return y diff --git a/src/librand/chacha.rs b/src/librand/chacha.rs index 6bd971e7b5d..aef6301dad7 100644 --- a/src/librand/chacha.rs +++ b/src/librand/chacha.rs @@ -194,7 +194,7 @@ impl<'a> SeedableRng<&'a [u32]> for ChaChaRng { impl Rand for ChaChaRng { fn rand(other: &mut R) -> ChaChaRng { let mut key : [u32; KEY_WORDS] = [0; KEY_WORDS]; - for word in key.iter_mut() { + for word in &mut key { *word = other.gen(); } SeedableRng::from_seed(key.as_slice()) diff --git a/src/librand/distributions/mod.rs b/src/librand/distributions/mod.rs index fb543e3d549..4958784f614 100644 --- a/src/librand/distributions/mod.rs +++ b/src/librand/distributions/mod.rs @@ -123,7 +123,7 @@ impl<'a, T: Clone> WeightedChoice<'a, T> { // we convert the list from individual weights to cumulative // weights so we can binary search. This *could* drop elements // with weight == 0 as an optimisation. - for item in items.iter_mut() { + for item in &mut *items { running_total = match running_total.checked_add(item.weight) { Some(n) => n, None => panic!("WeightedChoice::new called with a total weight \ diff --git a/src/librand/lib.rs b/src/librand/lib.rs index 3ff40038872..5290e680333 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -154,7 +154,7 @@ pub trait Rng : Sized { // optimisations are on. let mut count = 0; let mut num = 0; - for byte in dest.iter_mut() { + for byte in dest { if count == 0 { // we could micro-optimise here by generating a u32 if // we only need a few more bytes to fill the vector diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index 4ed61c6ffa1..2bc29e61d0d 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -329,7 +329,7 @@ macro_rules! run_lints { ($cx:expr, $f:ident, $($args:expr),*) => ({ // Move the vector of passes out of `$cx` so that we can // iterate over it mutably while passing `$cx` to the methods. let mut passes = $cx.lints.passes.take().unwrap(); - for obj in passes.iter_mut() { + for obj in &mut passes { obj.$f($cx, $($args),*); } $cx.lints.passes = Some(passes); diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs index a06a57beb61..8f5906db589 100644 --- a/src/librustc/middle/dataflow.rs +++ b/src/librustc/middle/dataflow.rs @@ -501,7 +501,7 @@ impl<'a, 'b, 'tcx, O:DataFlowOperator> PropagationContext<'a, 'b, 'tcx, O> { fn reset(&mut self, bits: &mut [uint]) { let e = if self.dfcx.oper.initial_value() {uint::MAX} else {0}; - for b in bits.iter_mut() { + for b in bits { *b = e; } } diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs index 2efc07a4023..17b62e463da 100644 --- a/src/librustc/middle/infer/error_reporting.rs +++ b/src/librustc/middle/infer/error_reporting.rs @@ -335,7 +335,7 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> { same_frs: &FreeRegionsFromSameFn) { let scope_id = same_frs.scope_id; let (sub_fr, sup_fr) = (same_frs.sub_fr, same_frs.sup_fr); - for sr in same_regions.iter_mut() { + for sr in &mut *same_regions { if sr.contains(&sup_fr.bound_region) && scope_id == sr.scope_id { sr.push(sub_fr.bound_region); diff --git a/src/librustc_borrowck/borrowck/gather_loans/move_error.rs b/src/librustc_borrowck/borrowck/gather_loans/move_error.rs index 2cd25de431e..d9e86bd4b6d 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/move_error.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/move_error.rs @@ -95,7 +95,7 @@ fn group_errors_with_same_origin<'tcx>(errors: &Vec>) } else { Vec::new() }; - for ge in grouped_errors.iter_mut() { + for ge in &mut *grouped_errors { if move_from_id == ge.move_from.id && error.move_to.is_some() { debug!("appending move_to to list"); ge.move_to_places.extend(move_to.into_iter()); diff --git a/src/librustc_trans/trans/cabi_x86_64.rs b/src/librustc_trans/trans/cabi_x86_64.rs index 22318fb6c14..2484e74e193 100644 --- a/src/librustc_trans/trans/cabi_x86_64.rs +++ b/src/librustc_trans/trans/cabi_x86_64.rs @@ -151,7 +151,7 @@ fn classify_ty(ty: Type) -> Vec { } fn all_mem(cls: &mut [RegClass]) { - for elt in cls.iter_mut() { + for elt in cls { *elt = Memory; } } diff --git a/src/librustc_trans/trans/debuginfo.rs b/src/librustc_trans/trans/debuginfo.rs index 9032eaeae50..291a88d17c1 100644 --- a/src/librustc_trans/trans/debuginfo.rs +++ b/src/librustc_trans/trans/debuginfo.rs @@ -2050,7 +2050,7 @@ fn prepare_struct_metadata<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, // The `Ty` values returned by `ty::struct_fields` can still contain // `ty_projection` variants, so normalize those away. - for field in fields.iter_mut() { + for field in &mut fields { field.mt.ty = monomorphize::normalize_associated_type(cx.tcx(), &field.mt.ty); } diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index d14945d1c9f..3bf34dfcd70 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -733,7 +733,7 @@ fn ast_type_binding_to_projection_predicate<'tcx>( // If converting for an object type, then remove the dummy-ty from `Self` now. // Yuckety yuck. if self_ty.is_none() { - for candidate in candidates.iter_mut() { + for candidate in &mut candidates { let mut dummy_substs = candidate.0.substs.clone(); assert!(dummy_substs.self_ty() == Some(dummy_self_ty)); dummy_substs.types.pop(SelfSpace); diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index a704508e6fa..d80b8791c26 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -1341,7 +1341,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { /// ! gets replaced with (), unconstrained ints with i32, and unconstrained floats with f64. pub fn default_type_parameters(&self) { use middle::ty::UnconstrainedNumeric::{UnconstrainedInt, UnconstrainedFloat, Neither}; - for (_, &mut ref ty) in self.inh.node_types.borrow_mut().iter_mut() { + for (_, &mut ref ty) in &mut *self.inh.node_types.borrow_mut() { let resolved = self.infcx().resolve_type_vars_if_possible(ty); if self.infcx().type_var_diverges(resolved) { demand::eqtype(self, codemap::DUMMY_SP, *ty, ty::mk_nil(self.tcx())); diff --git a/src/librustc_typeck/rscope.rs b/src/librustc_typeck/rscope.rs index 7aaf56336a8..ddb485d9776 100644 --- a/src/librustc_typeck/rscope.rs +++ b/src/librustc_typeck/rscope.rs @@ -165,7 +165,7 @@ impl<'r> RegionScope for ShiftedRscope<'r> { { match self.base_scope.anon_regions(span, count) { Ok(mut v) => { - for r in v.iter_mut() { + for r in &mut v { *r = ty_fold::shift_region(*r, 1); } Ok(v) diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index b140e26e037..07679480bfb 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -166,7 +166,7 @@ impl<'a, 'tcx> Clean for visit_ast::RustdocVisitor<'a, 'tcx> { _ => unreachable!(), }; let mut tmp = Vec::new(); - for child in m.items.iter_mut() { + for child in &mut m.items { match child.inner { ModuleItem(..) => {} _ => continue, diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 20ba0bb9e90..80e72777f93 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1270,7 +1270,7 @@ impl Context { v.push(NameDoc(myname, Some(shorter_line(item.doc_value())))); } - for (_, items) in map.iter_mut() { + for (_, items) in &mut map { items.sort(); } return map; diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index d3094cc745e..274c669d8df 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -134,7 +134,7 @@ impl AsciiExt> for [u8] { impl OwnedAsciiExt for Vec { #[inline] fn into_ascii_uppercase(mut self) -> Vec { - for byte in self.iter_mut() { + for byte in &mut self { *byte = byte.to_ascii_uppercase(); } self @@ -142,7 +142,7 @@ impl OwnedAsciiExt for Vec { #[inline] fn into_ascii_lowercase(mut self) -> Vec { - for byte in self.iter_mut() { + for byte in &mut self { *byte = byte.to_ascii_lowercase(); } self diff --git a/src/libstd/old_io/net/ip.rs b/src/libstd/old_io/net/ip.rs index 565f9d83818..d85251795c8 100644 --- a/src/libstd/old_io/net/ip.rs +++ b/src/libstd/old_io/net/ip.rs @@ -125,7 +125,7 @@ impl<'a> Parser<'a> { // Return result of first successful parser fn read_or(&mut self, parsers: &mut [Box Option>]) -> Option { - for pf in parsers.iter_mut() { + for pf in parsers { match self.read_atomically(|p: &mut Parser| pf.call_mut((p,))) { Some(r) => return Some(r), None => {} diff --git a/src/libstd/old_io/util.rs b/src/libstd/old_io/util.rs index 9a55f32c372..f78e3ac1f14 100644 --- a/src/libstd/old_io/util.rs +++ b/src/libstd/old_io/util.rs @@ -144,7 +144,7 @@ impl MultiWriter where W: Writer { impl Writer for MultiWriter where W: Writer { #[inline] fn write_all(&mut self, buf: &[u8]) -> old_io::IoResult<()> { - for writer in self.writers.iter_mut() { + for writer in &mut self.writers { try!(writer.write_all(buf)); } Ok(()) @@ -152,7 +152,7 @@ impl Writer for MultiWriter where W: Writer { #[inline] fn flush(&mut self) -> old_io::IoResult<()> { - for writer in self.writers.iter_mut() { + for writer in &mut self.writers { try!(writer.flush()); } Ok(()) diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index ac4a149a3ed..0eec182e0fc 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -444,7 +444,7 @@ pub fn parse(sess: &ParseSess, if token_name_eq(&tok, &token::Eof) { if eof_eis.len() == 1us { let mut v = Vec::new(); - for dv in (&mut eof_eis[0]).matches.iter_mut() { + for dv in &mut (&mut eof_eis[0]).matches { v.push(dv.pop().unwrap()); } return Success(nameize(sess, ms, &v[])); diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index a1362f5382c..9012ec2114d 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -37,7 +37,7 @@ pub trait MoveMap { impl MoveMap for Vec { fn move_map(mut self, mut f: F) -> Vec where F: FnMut(T) -> T { - for p in self.iter_mut() { + for p in &mut self { unsafe { // FIXME(#5016) this shouldn't need to zero to be safe. ptr::write(p, f(ptr::read_and_zero(p))); @@ -1117,7 +1117,7 @@ pub fn noop_fold_crate(Crate {module, attrs, config, mut exported_mac }, vec![], span) }; - for def in exported_macros.iter_mut() { + for def in &mut exported_macros { def.id = folder.new_id(def.id); } diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index a985c049fec..63969e996d3 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -1060,7 +1060,7 @@ impl Bencher { let loop_run = Duration::span(|| { - for p in samples.iter_mut() { + for p in &mut *samples { self.bench_n(n, |x| f(x)); *p = self.ns_per_iter() as f64; }; @@ -1068,7 +1068,7 @@ impl Bencher { stats::winsorize(samples, 5.0); summ = Some(stats::Summary::new(samples)); - for p in samples.iter_mut() { + for p in &mut *samples { self.bench_n(5 * n, |x| f(x)); *p = self.ns_per_iter() as f64; }; diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index 54f06fd0662..0ce115a0c1f 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -321,7 +321,7 @@ pub fn winsorize(samples: &mut [T], pct: T) { let lo = percentile_of_sorted(tmp.as_slice(), pct); let hundred: T = FromPrimitive::from_uint(100).unwrap(); let hi = percentile_of_sorted(tmp.as_slice(), hundred-pct); - for samp in samples.iter_mut() { + for samp in samples { if *samp > hi { *samp = hi } else if *samp < lo { diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs index c344084a4c0..5d17e3a460c 100644 --- a/src/test/bench/msgsend-ring-mutex-arcs.rs +++ b/src/test/bench/msgsend-ring-mutex-arcs.rs @@ -99,7 +99,7 @@ fn main() { thread_ring(0, msg_per_task, num_chan, num_port); // synchronize - for f in futures.iter_mut() { + for f in &mut futures { f.get() } }); diff --git a/src/test/bench/noise.rs b/src/test/bench/noise.rs index 664491eed7d..dc5b2f4596e 100644 --- a/src/test/bench/noise.rs +++ b/src/test/bench/noise.rs @@ -45,7 +45,7 @@ impl Noise2DContext { let mut rng = StdRng::new().unwrap(); let mut rgradients = [Vec2 { x: 0.0, y: 0.0 }; 256]; - for x in rgradients.iter_mut() { + for x in &mut rgradients[] { *x = random_gradient(&mut rng); } diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index 80a21402fe1..d061403d590 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -116,9 +116,9 @@ fn transform(piece: Vec<(i32, i32)> , all: bool) -> Vec> { }).collect(); // translating to (0, 0) as minimum coordinates. - for cur_piece in res.iter_mut() { + for cur_piece in &mut res { let (dy, dx) = *cur_piece.iter().min_by(|e| *e).unwrap(); - for &mut (ref mut y, ref mut x) in cur_piece.iter_mut() { + for &mut (ref mut y, ref mut x) in cur_piece { *y -= dy; *x -= dx; } } diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs index ca43216c662..a8de1469456 100644 --- a/src/test/bench/shootout-nbody.rs +++ b/src/test/bench/shootout-nbody.rs @@ -109,7 +109,7 @@ fn advance(bodies: &mut [Planet;N_BODIES], dt: f64, steps: int) { Some(bi) => bi, None => break }; - for bj in b_slice.iter_mut() { + for bj in &mut *b_slice { let dx = bi.x - bj.x; let dy = bi.y - bj.y; let dz = bi.z - bj.z; diff --git a/src/test/compile-fail/vec-mut-iter-borrow.rs b/src/test/compile-fail/vec-mut-iter-borrow.rs index 7dcedc8ecad..023ef72c453 100644 --- a/src/test/compile-fail/vec-mut-iter-borrow.rs +++ b/src/test/compile-fail/vec-mut-iter-borrow.rs @@ -11,7 +11,7 @@ fn main() { let mut xs: Vec = vec!(); - for x in xs.iter_mut() { + for x in &mut xs { xs.push(1) //~ ERROR cannot borrow `xs` } } diff --git a/src/test/run-pass/const-vec-of-fns.rs b/src/test/run-pass/const-vec-of-fns.rs index 0914402256d..4b07b1d3b07 100644 --- a/src/test/run-pass/const-vec-of-fns.rs +++ b/src/test/run-pass/const-vec-of-fns.rs @@ -23,7 +23,7 @@ static mut closures: &'static mut [S] = &mut [S(f as fn()), S(f as fn())]; pub fn main() { unsafe { for &bare_fn in bare_fns { bare_fn() } - for closure in closures.iter_mut() { + for closure in &mut *closures { let S(ref mut closure) = *closure; (*closure)() } diff --git a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs b/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs index 36a41896bcd..e074c3fb3d7 100644 --- a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs +++ b/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs @@ -16,7 +16,7 @@ fn test1() { fn test2() { let mut ints = [0; 32]; - for i in ints.iter_mut() { *i += 22; } + for i in &mut ints { *i += 22; } for i in &ints { assert!(*i == 22); } } -- cgit 1.4.1-3-g733a5 From fd702702ee90ddb47d207f8886818c7f91600713 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 31 Jan 2015 20:03:04 -0500 Subject: `for x in xs.into_iter()` -> `for x in xs` Also `for x in option.into_iter()` -> `if let Some(x) = option` --- src/compiletest/procsrv.rs | 4 ++-- src/compiletest/runtest.rs | 2 +- src/libcollections/btree/map.rs | 2 +- src/libcollections/dlist.rs | 2 +- src/libcollections/slice.rs | 2 +- src/libcollections/vec.rs | 4 ++-- src/libcollections/vec_map.rs | 2 +- src/libcore/fmt/mod.rs | 2 +- src/librustc/lint/context.rs | 10 +++++----- src/librustc/metadata/encoder.rs | 2 +- src/librustc/metadata/loader.rs | 4 ++-- src/librustc/middle/check_match.rs | 2 +- src/librustc/middle/dead.rs | 2 +- src/librustc/middle/subst.rs | 2 +- src/librustc/middle/traits/fulfill.rs | 4 ++-- src/librustc/middle/traits/mod.rs | 2 +- src/librustc/plugin/load.rs | 2 +- src/librustc/session/config.rs | 4 ++-- src/librustc_driver/driver.rs | 6 +++--- src/librustc_driver/lib.rs | 4 ++-- src/librustc_resolve/lib.rs | 4 ++-- src/librustc_trans/back/link.rs | 2 +- src/librustc_trans/back/lto.rs | 2 +- src/librustc_trans/back/write.rs | 2 +- src/librustc_trans/trans/callee.rs | 2 +- src/librustc_trans/trans/monomorphize.rs | 2 +- src/librustc_typeck/astconv.rs | 2 +- src/librustc_typeck/check/assoc.rs | 2 +- src/librustc_typeck/check/compare_method.rs | 2 +- src/librustc_typeck/check/method/probe.rs | 2 +- src/librustc_typeck/check/vtable.rs | 4 ++-- src/librustc_typeck/check/wf.rs | 4 ++-- src/librustc_typeck/collect.rs | 4 ++-- src/librustdoc/html/render.rs | 2 +- src/librustdoc/lib.rs | 2 +- src/libserialize/json.rs | 2 +- src/libstd/old_io/fs.rs | 2 +- src/libstd/old_io/net/mod.rs | 2 +- src/libstd/rt/at_exit_imp.rs | 2 +- src/libstd/sync/rwlock.rs | 2 +- src/libstd/sys/windows/process.rs | 2 +- src/libsyntax/attr.rs | 2 +- src/libsyntax/ext/concat.rs | 2 +- src/libsyntax/ext/expand.rs | 4 ++-- src/libsyntax/parse/parser.rs | 2 +- src/libsyntax/print/pprust.rs | 2 +- src/libtest/lib.rs | 2 +- src/rustbook/build.rs | 2 +- src/rustbook/test.rs | 2 +- src/test/bench/msgsend-pipes-shared.rs | 2 +- src/test/bench/msgsend-pipes.rs | 2 +- src/test/bench/shootout-binarytrees.rs | 2 +- src/test/bench/shootout-fannkuch-redux.rs | 2 +- src/test/bench/shootout-k-nucleotide.rs | 2 +- src/test/bench/shootout-mandelbrot.rs | 4 ++-- src/test/bench/shootout-pfib.rs | 2 +- src/test/debuginfo/destructured-for-loop-variable.rs | 2 +- src/test/run-pass/task-comm-3.rs | 2 +- src/test/run-pass/unboxed-closures-counter-not-moved.rs | 2 +- .../unboxed-closures-move-some-upvars-in-by-ref-closure.rs | 2 +- 60 files changed, 78 insertions(+), 78 deletions(-) (limited to 'src/libsyntax') diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs index 57f4171f7c2..4b0eea33d69 100644 --- a/src/compiletest/procsrv.rs +++ b/src/compiletest/procsrv.rs @@ -40,7 +40,7 @@ pub fn run(lib_path: &str, let mut cmd = Command::new(prog); cmd.args(args); add_target_env(&mut cmd, lib_path, aux_path); - for (key, val) in env.into_iter() { + for (key, val) in env { cmd.env(key, val); } @@ -72,7 +72,7 @@ pub fn run_background(lib_path: &str, let mut cmd = Command::new(prog); cmd.args(args); add_target_env(&mut cmd, lib_path, aux_path); - for (key, val) in env.into_iter() { + for (key, val) in env { cmd.env(key, val); } diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 2143cf22e05..3022973d9c1 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -1503,7 +1503,7 @@ fn _arm_exec_compiled_test(config: &Config, // run test via adb_run_wrapper runargs.push("shell".to_string()); - for (key, val) in env.into_iter() { + for (key, val) in env { runargs.push(format!("{}={}", key, val)); } runargs.push(format!("{}/adb_run_wrapper.sh", config.adb_test_dir)); diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index bc657a19d78..23eab79e6a4 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -197,7 +197,7 @@ impl BTreeMap { pub fn clear(&mut self) { let b = self.b; // avoid recursive destructors by manually traversing the tree - for _ in mem::replace(self, BTreeMap::with_b(b)).into_iter() {}; + for _ in mem::replace(self, BTreeMap::with_b(b)) {}; } // Searching in a B-Tree is pretty straightforward. diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index e229cd8a961..c6c8a6e4a1e 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -1061,7 +1061,7 @@ mod tests { let mut sum = v; sum.push_all(u.as_slice()); assert_eq!(sum.len(), m.len()); - for elt in sum.into_iter() { + for elt in sum { assert_eq!(m.pop_front(), Some(elt)) } assert_eq!(n.len(), 0); diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 3830ab9ee7b..4b4ea3e4c3c 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -2699,7 +2699,7 @@ mod tests { } assert_eq!(cnt, 8); - for f in v.into_iter() { + for f in v { assert!(f == Foo); cnt += 1; } diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index acf4b480dfb..22b0e0f7cc9 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -2333,7 +2333,7 @@ mod tests { fn test_move_items() { let vec = vec![1, 2, 3]; let mut vec2 : Vec = vec![]; - for i in vec.into_iter() { + for i in vec { vec2.push(i); } assert!(vec2 == vec![1, 2, 3]); @@ -2353,7 +2353,7 @@ mod tests { fn test_move_items_zero_sized() { let vec = vec![(), (), ()]; let mut vec2 : Vec<()> = vec![]; - for i in vec.into_iter() { + for i in vec { vec2.push(i); } assert!(vec2 == vec![(), (), ()]); diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index b07e172079e..e480d29541e 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -984,7 +984,7 @@ mod test_map { let mut m = VecMap::new(); m.insert(1, box 2); let mut called = false; - for (k, v) in m.into_iter() { + for (k, v) in m { assert!(!called); called = true; assert_eq!(k, 1); diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 20ef30b0a3e..ead49af18d0 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -482,7 +482,7 @@ impl<'a> Formatter<'a> { // Writes the sign if it exists, and then the prefix if it was requested let write_prefix = |&: f: &mut Formatter| { - for c in sign.into_iter() { + if let Some(c) = sign { let mut b = [0; 4]; let n = c.encode_utf8(&mut b).unwrap_or(0); let b = unsafe { str::from_utf8_unchecked(&b[..n]) }; diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index 2bc29e61d0d..91dba90b0d2 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -417,11 +417,11 @@ pub fn raw_emit_lint(sess: &Session, lint: &'static Lint, _ => sess.bug("impossible level in raw_emit_lint"), } - for note in note.into_iter() { + if let Some(note) = note { sess.note(¬e[]); } - for span in def.into_iter() { + if let Some(span) = def { sess.span_note(span, "lint level defined here"); } } @@ -492,7 +492,7 @@ impl<'a, 'tcx> Context<'a, 'tcx> { // specified closure let mut pushed = 0; - for result in gather_attrs(attrs).into_iter() { + for result in gather_attrs(attrs) { let v = match result { Err(span) => { self.tcx.sess.span_err(span, "malformed lint attribute"); @@ -519,7 +519,7 @@ impl<'a, 'tcx> Context<'a, 'tcx> { } }; - for (lint_id, level, span) in v.into_iter() { + for (lint_id, level, span) in v { let now = self.lints.get_level_source(lint_id).0; if now == Forbid && level != Forbid { let lint_name = lint_id.as_str(); @@ -727,7 +727,7 @@ impl<'a, 'tcx> IdVisitingOperation for Context<'a, 'tcx> { match self.tcx.sess.lints.borrow_mut().remove(&id) { None => {} Some(lints) => { - for (lint_id, span, msg) in lints.into_iter() { + for (lint_id, span, msg) in lints { self.span_lint(lint_id.lint, span, &msg[]) } } diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index 117ab4c8a5a..ccd524a2c03 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -1589,7 +1589,7 @@ fn encode_index(rbml_w: &mut Encoder, index: Vec>, mut write_fn: T: Hash, { let mut buckets: Vec>> = (0..256u16).map(|_| Vec::new()).collect(); - for elt in index.into_iter() { + for elt in index { let mut s = SipHasher::new(); elt.val.hash(&mut s); let h = s.finish() as uint; diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index f219bfffcb8..30b783cd509 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -425,7 +425,7 @@ impl<'a> Context<'a> { // libraries corresponds to the crate id and hash criteria that this // search is being performed for. let mut libraries = Vec::new(); - for (_hash, (rlibs, dylibs)) in candidates.into_iter() { + for (_hash, (rlibs, dylibs)) in candidates { let mut metadata = None; let rlib = self.extract_one(rlibs, "rlib", &mut metadata); let dylib = self.extract_one(dylibs, "dylib", &mut metadata); @@ -501,7 +501,7 @@ impl<'a> Context<'a> { } } - for (lib, kind) in m.into_iter() { + for (lib, kind) in m { info!("{} reading metadata from: {}", flavor, lib.display()); let metadata = match get_metadata_section(self.target.options.is_like_osx, &lib) { diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs index 72551daa4e6..38084d1c2c0 100644 --- a/src/librustc/middle/check_match.rs +++ b/src/librustc/middle/check_match.rs @@ -77,7 +77,7 @@ impl<'a> fmt::Debug for Matrix<'a> { let total_width = column_widths.iter().map(|n| *n).sum() + column_count * 3 + 1; let br = repeat('+').take(total_width).collect::(); try!(write!(f, "{}\n", br)); - for row in pretty_printed_matrix.into_iter() { + for row in pretty_printed_matrix { try!(write!(f, "+")); for (column, pat_str) in row.into_iter().enumerate() { try!(write!(f, " ")); diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index 6bad7f59441..4478e327087 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -318,7 +318,7 @@ fn has_allow_dead_code_or_lang_attr(attrs: &[ast::Attribute]) -> bool { } let dead_code = lint::builtin::DEAD_CODE.name_lower(); - for attr in lint::gather_attrs(attrs).into_iter() { + for attr in lint::gather_attrs(attrs) { match attr { Ok((ref name, lint::Allow, _)) if name.get() == dead_code => return true, diff --git a/src/librustc/middle/subst.rs b/src/librustc/middle/subst.rs index 2cf8a83db9b..43319540c4e 100644 --- a/src/librustc/middle/subst.rs +++ b/src/librustc/middle/subst.rs @@ -352,7 +352,7 @@ impl VecPerParamSpace { pub fn replace(&mut self, space: ParamSpace, elems: Vec) { // FIXME (#15435): slow; O(n^2); could enhance vec to make it O(n). self.truncate(space, 0); - for t in elems.into_iter() { + for t in elems { self.push(space, t); } } diff --git a/src/librustc/middle/traits/fulfill.rs b/src/librustc/middle/traits/fulfill.rs index ed058280483..8adcd256cce 100644 --- a/src/librustc/middle/traits/fulfill.rs +++ b/src/librustc/middle/traits/fulfill.rs @@ -125,7 +125,7 @@ impl<'tcx> FulfillmentContext<'tcx> { let mut selcx = SelectionContext::new(infcx, typer); let normalized = project::normalize_projection_type(&mut selcx, projection_ty, cause, 0); - for obligation in normalized.obligations.into_iter() { + for obligation in normalized.obligations { self.register_predicate_obligation(infcx, obligation); } @@ -289,7 +289,7 @@ impl<'tcx> FulfillmentContext<'tcx> { // Now go through all the successful ones, // registering any nested obligations for the future. - for new_obligation in new_obligations.into_iter() { + for new_obligation in new_obligations { self.register_predicate_obligation(selcx.infcx(), new_obligation); } } diff --git a/src/librustc/middle/traits/mod.rs b/src/librustc/middle/traits/mod.rs index 94da688181e..f69bf31626f 100644 --- a/src/librustc/middle/traits/mod.rs +++ b/src/librustc/middle/traits/mod.rs @@ -438,7 +438,7 @@ pub fn normalize_param_env<'a,'tcx>(param_env: &ty::ParameterEnvironment<'a,'tcx let mut fulfill_cx = FulfillmentContext::new(); let Normalized { value: predicates, obligations } = project::normalize(selcx, cause, ¶m_env.caller_bounds); - for obligation in obligations.into_iter() { + for obligation in obligations { fulfill_cx.register_predicate_obligation(selcx.infcx(), obligation); } try!(fulfill_cx.select_all_or_error(selcx.infcx(), param_env)); diff --git a/src/librustc/plugin/load.rs b/src/librustc/plugin/load.rs index 22edd7c691a..b9bf577b38e 100644 --- a/src/librustc/plugin/load.rs +++ b/src/librustc/plugin/load.rs @@ -204,7 +204,7 @@ impl<'a> PluginLoader<'a> { } } - for mut def in macros.into_iter() { + for mut def in macros { let name = token::get_ident(def.ident); def.use_locally = match macro_selection.as_ref() { None => true, diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index afeb123b7a5..88f6dc673cf 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -300,7 +300,7 @@ macro_rules! options { pub fn $buildfn(matches: &getopts::Matches) -> $struct_name { let mut op = $defaultfn(); - for option in matches.opt_strs($prefix).into_iter() { + for option in matches.opt_strs($prefix) { let mut iter = option.splitn(1, '='); let key = iter.next().unwrap(); let value = iter.next(); @@ -831,7 +831,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options { let mut describe_lints = false; for &level in &[lint::Allow, lint::Warn, lint::Deny, lint::Forbid] { - for lint_name in matches.opt_strs(level.as_str()).into_iter() { + for lint_name in matches.opt_strs(level.as_str()) { if lint_name == "help" { describe_lints = true; } else { diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index e8ea349c3db..8d73532cf52 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -424,7 +424,7 @@ pub fn phase_2_configure_and_expand(sess: &Session, diagnostics::plugin::expand_build_diagnostic_array); } - for registrar in registrars.into_iter() { + for registrar in registrars { registry.args_hidden = Some(registrar.args); (registrar.fun)(&mut registry); } @@ -434,11 +434,11 @@ pub fn phase_2_configure_and_expand(sess: &Session, { let mut ls = sess.lint_store.borrow_mut(); - for pass in lint_passes.into_iter() { + for pass in lint_passes { ls.register_pass(Some(sess), true, pass); } - for (name, to) in lint_groups.into_iter() { + for (name, to) in lint_groups { ls.register_group(Some(sess), true, name, to); } } diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index a8f5cfa6b3f..794d66e66ab 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -373,7 +373,7 @@ Available lint options: println!(" {} {:7.7} {}", padded("----"), "-------", "-------"); let print_lints = |&: lints: Vec<&Lint>| { - for lint in lints.into_iter() { + for lint in lints { let name = lint.name_lower().replace("_", "-"); println!(" {} {:7.7} {}", padded(&name[]), lint.default_level.as_str(), lint.desc); @@ -400,7 +400,7 @@ Available lint options: println!(" {} {}", padded("----"), "---------"); let print_lint_groups = |&: lints: Vec<(&'static str, Vec)>| { - for (name, to) in lints.into_iter() { + for (name, to) in lints { let name = name.chars().map(|x| x.to_lowercase()) .collect::().replace("_", "-"); let desc = to.into_iter().map(|x| x.as_str().replace("_", "-")) diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index c10b7124218..a5fb57eadc4 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -3607,10 +3607,10 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> { TyQPath(ref qpath) => { self.resolve_type(&*qpath.self_type); self.resolve_trait_reference(ty.id, &*qpath.trait_ref, TraitQPath); - for ty in qpath.item_path.parameters.types().into_iter() { + for ty in qpath.item_path.parameters.types() { self.resolve_type(&**ty); } - for binding in qpath.item_path.parameters.bindings().into_iter() { + for binding in qpath.item_path.parameters.bindings() { self.resolve_type(&*binding.ty); } } diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index eeb6d9fab5e..145cf46ad9d 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -1275,7 +1275,7 @@ fn add_upstream_native_libraries(cmd: &mut Command, sess: &Session) { // we're just getting an ordering of crate numbers, we're not worried about // the paths. let crates = sess.cstore.get_used_crates(cstore::RequireStatic); - for (cnum, _) in crates.into_iter() { + for (cnum, _) in crates { let libs = csearch::get_native_libraries(&sess.cstore, cnum); for &(kind, ref lib) in &libs { match kind { diff --git a/src/librustc_trans/back/lto.rs b/src/librustc_trans/back/lto.rs index 1a5310bb0a8..38c68bc9fa4 100644 --- a/src/librustc_trans/back/lto.rs +++ b/src/librustc_trans/back/lto.rs @@ -48,7 +48,7 @@ pub fn run(sess: &session::Session, llmod: ModuleRef, // load the bitcode from the archive. Then merge it into the current LLVM // module that we've got. let crates = sess.cstore.get_used_crates(cstore::RequireStatic); - for (cnum, path) in crates.into_iter() { + for (cnum, path) in crates { let name = sess.cstore.get_crate_data(cnum).name.clone(); let path = match path { Some(p) => p, diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs index c54e3e02d3c..5312d2ca1dd 100644 --- a/src/librustc_trans/back/write.rs +++ b/src/librustc_trans/back/write.rs @@ -941,7 +941,7 @@ fn run_work_multithreaded(sess: &Session, } let mut panicked = false; - for rx in futures.into_iter() { + for rx in futures { match rx.recv() { Ok(()) => {}, Err(_) => { diff --git a/src/librustc_trans/trans/callee.rs b/src/librustc_trans/trans/callee.rs index 5f3cb01d762..5f383d54a68 100644 --- a/src/librustc_trans/trans/callee.rs +++ b/src/librustc_trans/trans/callee.rs @@ -1045,7 +1045,7 @@ pub fn trans_args<'a, 'blk, 'tcx>(cx: Block<'blk, 'tcx>, })); assert_eq!(arg_tys.len(), 1 + rhs.len()); - for (rhs, rhs_id) in rhs.into_iter() { + for (rhs, rhs_id) in rhs { llargs.push(unpack_result!(bcx, { trans_arg_datum(bcx, arg_tys[1], rhs, arg_cleanup_scope, diff --git a/src/librustc_trans/trans/monomorphize.rs b/src/librustc_trans/trans/monomorphize.rs index cc0d76efcf0..b3d388b0f02 100644 --- a/src/librustc_trans/trans/monomorphize.rs +++ b/src/librustc_trans/trans/monomorphize.rs @@ -333,7 +333,7 @@ pub fn normalize_associated_type<'tcx,T>(tcx: &ty::ctxt<'tcx>, value: &T) -> T obligations.repr(tcx)); let mut fulfill_cx = traits::FulfillmentContext::new(); - for obligation in obligations.into_iter() { + for obligation in obligations { fulfill_cx.register_predicate_obligation(&infcx, obligation); } let result = drain_fulfillment_cx(DUMMY_SP, &infcx, &mut fulfill_cx, &result); diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index 3bf34dfcd70..8809931cd80 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -537,7 +537,7 @@ pub fn instantiate_poly_trait_ref<'tcx>( instantiate_trait_ref(this, &shifted_rscope, &ast_trait_ref.trait_ref, self_ty, Some(&mut projections)); - for projection in projections.into_iter() { + for projection in projections { poly_projections.push(ty::Binder(projection)); } diff --git a/src/librustc_typeck/check/assoc.rs b/src/librustc_typeck/check/assoc.rs index 0e0a9294640..377af080526 100644 --- a/src/librustc_typeck/check/assoc.rs +++ b/src/librustc_typeck/check/assoc.rs @@ -33,7 +33,7 @@ pub fn normalize_associated_types_in<'a,'tcx,T>(infcx: &InferCtxt<'a,'tcx>, debug!("normalize_associated_types_in: result={} predicates={}", result.repr(infcx.tcx), obligations.repr(infcx.tcx)); - for obligation in obligations.into_iter() { + for obligation in obligations { fulfillment_cx.register_predicate_obligation(infcx, obligation); } result diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs index 31b14ea3f3d..dc4d7d46647 100644 --- a/src/librustc_typeck/check/compare_method.rs +++ b/src/librustc_typeck/check/compare_method.rs @@ -248,7 +248,7 @@ pub fn compare_impl_method<'tcx>(tcx: &ty::ctxt<'tcx>, let mut selcx = traits::SelectionContext::new(&infcx, &trait_param_env); - for predicate in impl_pred.fns.into_iter() { + for predicate in impl_pred.fns { let traits::Normalized { value: predicate, .. } = traits::normalize(&mut selcx, normalize_cause.clone(), &predicate); diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs index 8ad67b43178..a988fb4cc6e 100644 --- a/src/librustc_typeck/check/method/probe.rs +++ b/src/librustc_typeck/check/method/probe.rs @@ -448,7 +448,7 @@ impl<'a,'tcx> ProbeContext<'a,'tcx> { { let mut duplicates = HashSet::new(); let opt_applicable_traits = self.fcx.ccx.trait_map.get(&expr_id); - for applicable_traits in opt_applicable_traits.into_iter() { + if let Some(applicable_traits) = opt_applicable_traits { for &trait_did in applicable_traits { if duplicates.insert(trait_did) { try!(self.assemble_extension_candidates_for_trait(trait_did)); diff --git a/src/librustc_typeck/check/vtable.rs b/src/librustc_typeck/check/vtable.rs index 43910a937e8..6f66010925e 100644 --- a/src/librustc_typeck/check/vtable.rs +++ b/src/librustc_typeck/check/vtable.rs @@ -142,7 +142,7 @@ pub fn check_object_safety<'tcx>(tcx: &ty::ctxt<'tcx>, ty::item_path_str(tcx, object_trait_ref.def_id())); let violations = traits::object_safety_violations(tcx, object_trait_ref.clone()); - for violation in violations.into_iter() { + for violation in violations { match violation { ObjectSafetyViolation::SizedSelf => { tcx.sess.span_note( @@ -269,7 +269,7 @@ fn check_object_type_binds_all_associated_types<'tcx>(tcx: &ty::ctxt<'tcx>, associated_types.remove(&pair); } - for (trait_def_id, name) in associated_types.into_iter() { + for (trait_def_id, name) in associated_types { span_err!(tcx.sess, span, E0191, "the value of the associated type `{}` (from the trait `{}`) must be specified", name.user_string(tcx), diff --git a/src/librustc_typeck/check/wf.rs b/src/librustc_typeck/check/wf.rs index 24153fd94ea..71b495af444 100644 --- a/src/librustc_typeck/check/wf.rs +++ b/src/librustc_typeck/check/wf.rs @@ -268,10 +268,10 @@ impl<'ccx, 'tcx> CheckTypeWellFormedVisitor<'ccx, 'tcx> { let selcx = &mut traits::SelectionContext::new(fcx.infcx(), fcx); traits::normalize(selcx, cause.clone(), &predicates) }; - for predicate in predicates.value.into_iter() { + for predicate in predicates.value { fcx.register_predicate(traits::Obligation::new(cause.clone(), predicate)); } - for obligation in predicates.obligations.into_iter() { + for obligation in predicates.obligations { fcx.register_predicate(obligation); } }); diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 6d92343d332..4114e92a096 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1109,7 +1109,7 @@ fn ty_generics_for_trait<'a, 'tcx>(ccx: &CollectCtxt<'a, 'tcx>, debug!("ty_generics_for_trait: assoc_predicates={}", assoc_predicates.repr(ccx.tcx)); - for assoc_predicate in assoc_predicates.into_iter() { + for assoc_predicate in assoc_predicates { generics.predicates.push(subst::TypeSpace, assoc_predicate); } @@ -1310,7 +1310,7 @@ fn ty_generics<'a,'tcx>(ccx: &CollectCtxt<'a,'tcx>, { for type_param_def in result.types.get_slice(space) { let param_ty = ty::mk_param_from_def(tcx, type_param_def); - for predicate in ty::predicates(tcx, param_ty, &type_param_def.bounds).into_iter() { + for predicate in ty::predicates(tcx, param_ty, &type_param_def.bounds) { result.predicates.push(space, predicate); } } diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 80e72777f93..6247c6dad14 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1231,7 +1231,7 @@ impl Context { _ => unreachable!() }; this.sidebar = this.build_sidebar(&m); - for item in m.items.into_iter() { + for item in m.items { f(this,item); } Ok(()) diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 9efd7cfb2e2..531e798a59f 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -431,7 +431,7 @@ fn rust_input(cratefile: &str, externs: core::Externs, matches: &getopts::Matche pm.add_plugin(plugin); } info!("loading plugins..."); - for pname in plugins.into_iter() { + for pname in plugins { pm.load_plugin(pname); } diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index f43f22ec57c..3bc9e699035 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -2371,7 +2371,7 @@ impl ::Decoder for Decoder { { let obj = try!(expect!(self.pop(), Object)); let len = obj.len(); - for (key, value) in obj.into_iter() { + for (key, value) in obj { self.stack.push(value); self.stack.push(Json::String(key)); } diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index 142f723ef71..e1006f23996 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -649,7 +649,7 @@ pub fn rmdir_recursive(path: &Path) -> IoResult<()> { // delete all regular files in the way and push subdirs // on the stack - for child in children.into_iter() { + for child in children { // FIXME(#12795) we should use lstat in all cases let child_type = match cfg!(windows) { true => try!(update_err(stat(&child), path)), diff --git a/src/libstd/old_io/net/mod.rs b/src/libstd/old_io/net/mod.rs index d8394aa8b6a..bbe3a71dcc0 100644 --- a/src/libstd/old_io/net/mod.rs +++ b/src/libstd/old_io/net/mod.rs @@ -36,7 +36,7 @@ fn with_addresses(addr: A, mut action: F) -> IoResult where let addresses = try!(addr.to_socket_addr_all()); let mut err = DEFAULT_ERROR; - for addr in addresses.into_iter() { + for addr in addresses { match action(addr) { Ok(r) => return Ok(r), Err(e) => err = e diff --git a/src/libstd/rt/at_exit_imp.rs b/src/libstd/rt/at_exit_imp.rs index 5823f8453d8..3f15cf71ec3 100644 --- a/src/libstd/rt/at_exit_imp.rs +++ b/src/libstd/rt/at_exit_imp.rs @@ -58,7 +58,7 @@ pub fn cleanup() { // If we never called init, not need to cleanup! if queue as uint != 0 { let queue: Box = mem::transmute(queue); - for to_run in queue.into_iter() { + for to_run in *queue { to_run.invoke(()); } } diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index 95b570dd9c8..2dfc708e15b 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -508,7 +508,7 @@ mod tests { } // Wait for children to pass their asserts - for r in children.into_iter() { + for r in children { assert!(r.join().is_ok()); } diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index a0a0c08ed09..58797111a20 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -147,7 +147,7 @@ impl Process { // Split the value and test each path to see if the // program exists. - for path in os::split_paths(v.container_as_bytes()).into_iter() { + for path in os::split_paths(v.container_as_bytes()) { let path = path.join(cfg.program().as_bytes()) .with_extension(os::consts::EXE_EXTENSION); if path.exists() { diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 61ddd240abc..e5cd6f63690 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -490,7 +490,7 @@ fn find_stability_generic<'a, pub fn find_stability(diagnostic: &SpanHandler, attrs: &[Attribute], item_sp: Span) -> Option { let (s, used) = find_stability_generic(diagnostic, attrs.iter(), item_sp); - for used in used.into_iter() { mark_used(used) } + for used in used { mark_used(used) } return s; } diff --git a/src/libsyntax/ext/concat.rs b/src/libsyntax/ext/concat.rs index 39895a3946a..4e10cc9aacc 100644 --- a/src/libsyntax/ext/concat.rs +++ b/src/libsyntax/ext/concat.rs @@ -25,7 +25,7 @@ pub fn expand_syntax_ext(cx: &mut base::ExtCtxt, None => return base::DummyResult::expr(sp) }; let mut accumulator = String::new(); - for e in es.into_iter() { + for e in es { match e.node { ast::ExprLit(ref lit) => { match lit.node { diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 8b4816f5d2b..2787339aac0 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1420,11 +1420,11 @@ pub fn expand_crate(parse_sess: &parse::ParseSess, let mut cx = ExtCtxt::new(parse_sess, c.config.clone(), cfg); let mut expander = MacroExpander::new(&mut cx); - for def in imported_macros.into_iter() { + for def in imported_macros { expander.cx.insert_macro(def); } - for (name, extension) in user_exts.into_iter() { + for (name, extension) in user_exts { expander.cx.syntax_env.insert(name, extension); } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b7960d9e709..27fd803d3fe 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5445,7 +5445,7 @@ impl<'a> Parser<'a> { seq_sep_trailing_allowed(token::Comma), |p| p.parse_ty_sum() ); - for ty in arg_tys.into_iter() { + for ty in arg_tys { args.push(ast::VariantArg { ty: ty, id: ast::DUMMY_NODE_ID, diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 21cd02b3851..5c42485f239 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -966,7 +966,7 @@ impl<'a> State<'a> { try!(self.print_generics(generics)); let bounds: Vec<_> = bounds.iter().map(|b| b.clone()).collect(); let mut real_bounds = Vec::with_capacity(bounds.len()); - for b in bounds.into_iter() { + for b in bounds { if let TraitTyParamBound(ref ptr, ast::TraitBoundModifier::Maybe) = b { try!(space(&mut self.s)); try!(self.word_space("for ?")); diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 63969e996d3..25377e3afa1 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -806,7 +806,7 @@ fn run_tests(opts: &TestOpts, // All benchmarks run at the end, in serial. // (this includes metric fns) - for b in filtered_benchs_and_metrics.into_iter() { + for b in filtered_benchs_and_metrics { try!(callback(TeWait(b.desc.clone(), b.testfn.padding()))); run_test(opts, !opts.run_benchmarks, b, tx.clone()); let (test, result, stdout) = rx.recv().unwrap(); diff --git a/src/rustbook/build.rs b/src/rustbook/build.rs index ccb572a113a..3c9c4bdedcc 100644 --- a/src/rustbook/build.rs +++ b/src/rustbook/build.rs @@ -177,7 +177,7 @@ impl Subcommand for Build { } Err(errors) => { let n = errors.len(); - for err in errors.into_iter() { + for err in errors { term.err(&format!("error: {}", err)[]); } diff --git a/src/rustbook/test.rs b/src/rustbook/test.rs index db02481cb02..d3cb8a7316e 100644 --- a/src/rustbook/test.rs +++ b/src/rustbook/test.rs @@ -64,7 +64,7 @@ impl Subcommand for Test { } } Err(errors) => { - for err in errors.into_iter() { + for err in errors { term.err(&err[]); } return Err(box "There was an error." as Box); diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index 6928397566d..259b4d9418d 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -75,7 +75,7 @@ fn run(args: &[String]) { server(&from_parent, &to_parent); }); - for r in worker_results.into_iter() { + for r in worker_results { let _ = r.join(); } diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index 9bf0ce1a590..1341c03e505 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -82,7 +82,7 @@ fn run(args: &[String]) { server(&from_parent, &to_parent); }); - for r in worker_results.into_iter() { + for r in worker_results { let _ = r.join(); } diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs index 4182f8b651b..dc65a63c5cb 100644 --- a/src/test/bench/shootout-binarytrees.rs +++ b/src/test/bench/shootout-binarytrees.rs @@ -114,7 +114,7 @@ fn main() { Thread::scoped(move || inner(depth, iterations)) }).collect::>(); - for message in messages.into_iter() { + for message in messages { println!("{}", message.join().ok().unwrap()); } diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout-fannkuch-redux.rs index 03666c84d57..47613e2d69c 100644 --- a/src/test/bench/shootout-fannkuch-redux.rs +++ b/src/test/bench/shootout-fannkuch-redux.rs @@ -171,7 +171,7 @@ fn fannkuch(n: i32) -> (i32, i32) { let mut checksum = 0; let mut maxflips = 0; - for fut in futures.into_iter() { + for fut in futures { let (cs, mf) = fut.join().ok().unwrap(); checksum += cs; maxflips = cmp::max(maxflips, mf); diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index a7a47ff07ce..e3f8e60df93 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -308,7 +308,7 @@ fn main() { Thread::scoped(move|| generate_frequencies(input.as_slice(), occ.len())) }).collect(); - for (i, freq) in nb_freqs.into_iter() { + for (i, freq) in nb_freqs { print_frequencies(&freq.join().ok().unwrap(), i); } for (&occ, freq) in OCCURRENCES.iter().zip(occ_freqs.into_iter()) { diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index 754b891eb63..3bd786a3be0 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -106,7 +106,7 @@ fn mandelbrot(w: uint, mut out: W) -> old_io::IoResult<()> { }) }).collect::>(); - for res in precalc_futures.into_iter() { + for res in precalc_futures { let (rs, is) = res.join().ok().unwrap(); precalc_r.extend(rs.into_iter()); precalc_i.extend(is.into_iter()); @@ -142,7 +142,7 @@ fn mandelbrot(w: uint, mut out: W) -> old_io::IoResult<()> { }).collect::>(); try!(writeln!(&mut out as &mut Writer, "P4\n{} {}", w, h)); - for res in data.into_iter() { + for res in data { try!(out.write(res.join().ok().unwrap().as_slice())); } out.flush() diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index dd3ae1699a9..ea1d913b3e2 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -82,7 +82,7 @@ fn stress(num_tasks: int) { stress_task(i); })); } - for r in results.into_iter() { + for r in results { let _ = r.join(); } } diff --git a/src/test/debuginfo/destructured-for-loop-variable.rs b/src/test/debuginfo/destructured-for-loop-variable.rs index 163771a2362..0d526d60190 100644 --- a/src/test/debuginfo/destructured-for-loop-variable.rs +++ b/src/test/debuginfo/destructured-for-loop-variable.rs @@ -215,7 +215,7 @@ fn main() { zzz(); // #break } - for simple_tuple_ident in vec![(34903493u32, 232323i64)].into_iter() { + for simple_tuple_ident in vec![(34903493u32, 232323i64)] { zzz(); // #break } } diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index 4aec3d608ac..90282946838 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -61,7 +61,7 @@ fn test00() { } // Join spawned tasks... - for r in results.into_iter() { r.join(); } + for r in results { r.join(); } println!("Completed: Final number is: "); println!("{}", sum); diff --git a/src/test/run-pass/unboxed-closures-counter-not-moved.rs b/src/test/run-pass/unboxed-closures-counter-not-moved.rs index e921f0c723e..0b85916d224 100644 --- a/src/test/run-pass/unboxed-closures-counter-not-moved.rs +++ b/src/test/run-pass/unboxed-closures-counter-not-moved.rs @@ -21,7 +21,7 @@ fn main() { call(|| { // Move `y`, but do not move `counter`, even though it is read // by value (note that it is also mutated). - for item in y.into_iter() { + for item in y { let v = counter; counter += v; } diff --git a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs b/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs index 9534ee6fa12..99663646254 100644 --- a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs +++ b/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs @@ -22,7 +22,7 @@ fn main() { // Here: `x` must be captured with a mutable reference in // order for us to append on it, and `y` must be captured by // value. - for item in y.into_iter() { + for item in y { x.push(item); } }); -- cgit 1.4.1-3-g733a5 From 3484706c38272828efc50b2553578afc62230dbb Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sat, 31 Jan 2015 09:17:50 -0500 Subject: remove unused mut qualifiers --- src/libcollections/binary_heap.rs | 2 +- src/libcollections/bit.rs | 6 +++--- src/libcollections/btree/map.rs | 2 +- src/libcollections/btree/set.rs | 2 +- src/libcollections/dlist.rs | 2 +- src/libcollections/enum_set.rs | 2 +- src/libcollections/lib.rs | 2 -- src/libcollections/ring_buf.rs | 2 +- src/libcollections/string.rs | 4 ++-- src/libcollections/vec.rs | 4 ++-- src/libcollections/vec_map.rs | 2 +- src/libcore/iter.rs | 10 +++++----- src/libcore/lib.rs | 1 - src/libcore/result.rs | 2 +- src/librustc/lib.rs | 2 -- src/librustc/metadata/loader.rs | 2 +- src/librustc/middle/subst.rs | 2 +- src/librustc/middle/traits/select.rs | 2 +- src/librustc_trans/back/link.rs | 6 +++--- src/librustc_trans/lib.rs | 2 -- src/librustc_trans/trans/debuginfo.rs | 2 +- src/librustc_typeck/check/coercion.rs | 2 +- src/librustc_typeck/check/mod.rs | 2 +- src/librustc_typeck/check/regionck.rs | 2 +- src/librustc_typeck/collect.rs | 4 ++-- src/librustc_typeck/lib.rs | 1 - src/libstd/collections/hash/map.rs | 4 ++-- src/libstd/collections/hash/set.rs | 2 +- src/libstd/lib.rs | 1 - src/libstd/old_io/fs.rs | 2 +- src/libstd/sys/common/wtf8.rs | 2 +- src/libsyntax/attr.rs | 2 +- src/libsyntax/lib.rs | 2 -- src/libsyntax/util/small_vector.rs | 2 +- src/libtest/lib.rs | 2 -- src/libtest/stats.rs | 2 +- 36 files changed, 40 insertions(+), 53 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index 56bc573cbb4..b51ec13335e 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -673,7 +673,7 @@ impl<'a, T> IntoIterator for &'a BinaryHeap where T: Ord { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for BinaryHeap { - fn extend>(&mut self, mut iter: Iter) { + fn extend>(&mut self, iter: Iter) { let (lower, _) = iter.size_hint(); self.reserve(lower); diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs index da00b25bbbc..3e603f6ebaf 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -934,7 +934,7 @@ impl FromIterator for Bitv { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for Bitv { #[inline] - fn extend>(&mut self, mut iterator: I) { + fn extend>(&mut self, iterator: I) { let (min, _) = iterator.size_hint(); self.reserve(min); for element in iterator { @@ -1141,7 +1141,7 @@ impl FromIterator for BitvSet { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for BitvSet { #[inline] - fn extend>(&mut self, mut iterator: I) { + fn extend>(&mut self, iterator: I) { for i in iterator { self.insert(i); } @@ -1353,7 +1353,7 @@ impl BitvSet { } // virtually pad other with 0's for equal lengths - let mut other_words = { + let other_words = { let (_, result) = match_words(self_bitv, other_bitv); result }; diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index 23eab79e6a4..f1d39b3f2f4 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -846,7 +846,7 @@ impl FromIterator<(K, V)> for BTreeMap { #[stable(feature = "rust1", since = "1.0.0")] impl Extend<(K, V)> for BTreeMap { #[inline] - fn extend>(&mut self, mut iter: T) { + fn extend>(&mut self, iter: T) { for (k, v) in iter { self.insert(k, v); } diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index a4e28d36a05..d58ae03ef7a 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -499,7 +499,7 @@ impl<'a, T> IntoIterator for &'a BTreeSet { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for BTreeSet { #[inline] - fn extend>(&mut self, mut iter: Iter) { + fn extend>(&mut self, iter: Iter) { for elem in iter { self.insert(elem); } diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index c6c8a6e4a1e..d85e9ee3226 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -856,7 +856,7 @@ impl<'a, T> IntoIterator for &'a mut DList { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for DList { - fn extend>(&mut self, mut iterator: T) { + fn extend>(&mut self, iterator: T) { for elt in iterator { self.push_back(elt); } } } diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index 14a3a5a0990..8cbf50d29f2 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -266,7 +266,7 @@ impl<'a, E> IntoIterator for &'a EnumSet where E: CLike { } impl Extend for EnumSet { - fn extend>(&mut self, mut iterator: I) { + fn extend>(&mut self, iterator: I) { for element in iterator { self.insert(element); } diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index ce00bd48bb8..102dfb3df9d 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -22,8 +22,6 @@ html_root_url = "http://doc.rust-lang.org/nightly/", html_playground_url = "http://play.rust-lang.org/")] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap - #![feature(alloc)] #![feature(box_syntax)] #![feature(core)] diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs index b7d16b864fd..18021dea9f2 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -1635,7 +1635,7 @@ impl<'a, T> IntoIterator for &'a mut RingBuf { #[stable(feature = "rust1", since = "1.0.0")] impl Extend for RingBuf { - fn extend>(&mut self, mut iterator: T) { + fn extend>(&mut self, iterator: T) { for elt in iterator { self.push_back(elt); } diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index b9857973946..554eee765f3 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -729,7 +729,7 @@ impl<'a> FromIterator<&'a str> for String { #[unstable(feature = "collections", reason = "waiting on Extend stabilization")] impl Extend for String { - fn extend>(&mut self, mut iterator: I) { + fn extend>(&mut self, iterator: I) { let (lower_bound, _) = iterator.size_hint(); self.reserve(lower_bound); for ch in iterator { @@ -741,7 +741,7 @@ impl Extend for String { #[unstable(feature = "collections", reason = "waiting on Extend stabilization")] impl<'a> Extend<&'a str> for String { - fn extend>(&mut self, mut iterator: I) { + fn extend>(&mut self, iterator: I) { // A guess that at least one byte per iterator element will be needed. let (lower_bound, _) = iterator.size_hint(); self.reserve(lower_bound); diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 22b0e0f7cc9..e9ddfd4872f 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1375,7 +1375,7 @@ impl ops::DerefMut for Vec { #[stable(feature = "rust1", since = "1.0.0")] impl FromIterator for Vec { #[inline] - fn from_iter>(mut iterator: I) -> Vec { + fn from_iter>(iterator: I) -> Vec { let (lower, _) = iterator.size_hint(); let mut vector = Vec::with_capacity(lower); for element in iterator { @@ -1412,7 +1412,7 @@ impl<'a, T> IntoIterator for &'a mut Vec { #[unstable(feature = "collections", reason = "waiting on Extend stability")] impl Extend for Vec { #[inline] - fn extend>(&mut self, mut iterator: I) { + fn extend>(&mut self, iterator: I) { let (lower, _) = iterator.size_hint(); self.reserve(lower); for element in iterator { diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index e480d29541e..044a350bffb 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -562,7 +562,7 @@ impl<'a, T> IntoIterator for &'a mut VecMap { #[stable(feature = "rust1", since = "1.0.0")] impl Extend<(uint, V)> for VecMap { - fn extend>(&mut self, mut iter: Iter) { + fn extend>(&mut self, iter: Iter) { for (k, v) in iter { self.insert(k, v); } diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index b6b6c52d568..b954e69eaa8 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -174,7 +174,7 @@ pub trait IteratorExt: Iterator + Sized { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - fn last(mut self) -> Option { + fn last(self) -> Option { let mut last = None; for x in self { last = Some(x); } last @@ -588,7 +588,7 @@ pub trait IteratorExt: Iterator + Sized { /// ``` #[unstable(feature = "core", reason = "recently added as part of collections reform")] - fn partition(mut self, mut f: F) -> (B, B) where + fn partition(self, mut f: F) -> (B, B) where B: Default + Extend, F: FnMut(&Self::Item) -> bool { @@ -617,7 +617,7 @@ pub trait IteratorExt: Iterator + Sized { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - fn fold(mut self, init: B, mut f: F) -> B where + fn fold(self, init: B, mut f: F) -> B where F: FnMut(B, Self::Item) -> B, { let mut accum = init; @@ -638,7 +638,7 @@ pub trait IteratorExt: Iterator + Sized { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - fn all(mut self, mut f: F) -> bool where F: FnMut(Self::Item) -> bool { + fn all(self, mut f: F) -> bool where F: FnMut(Self::Item) -> bool { for x in self { if !f(x) { return false; } } true } @@ -946,7 +946,7 @@ pub trait IteratorExt: Iterator + Sized { /// assert_eq!([2, 4], right); /// ``` #[unstable(feature = "core", reason = "recent addition")] - fn unzip(mut self) -> (FromA, FromB) where + fn unzip(self) -> (FromA, FromB) where FromA: Default + Extend, FromB: Default + Extend, Self: Iterator, diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index d2bc30fa74a..5e9793f270d 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -59,7 +59,6 @@ #![no_std] #![allow(raw_pointer_derive)] #![deny(missing_docs)] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap #![feature(int_uint)] #![feature(intrinsics, lang_items)] diff --git a/src/libcore/result.rs b/src/libcore/result.rs index fc7d4e868f7..d610962f862 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -956,7 +956,7 @@ pub fn fold V, Iter: Iterator>>( - mut iterator: Iter, + iterator: Iter, mut init: V, mut f: F) -> Result { diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 6ae861fcb04..32f7c43e828 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -23,8 +23,6 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/")] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap - #![feature(box_syntax)] #![feature(collections)] #![feature(core)] diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index 30b783cd509..2fb5a6b64a6 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -610,7 +610,7 @@ impl<'a> Context<'a> { let mut rlibs = HashMap::new(); let mut dylibs = HashMap::new(); { - let mut locs = locs.iter().map(|l| Path::new(&l[])).filter(|loc| { + let locs = locs.iter().map(|l| Path::new(&l[])).filter(|loc| { if !loc.exists() { sess.err(&format!("extern location for {} does not exist: {}", self.crate_name, loc.display())[]); diff --git a/src/librustc/middle/subst.rs b/src/librustc/middle/subst.rs index 43319540c4e..eb6bc4c3835 100644 --- a/src/librustc/middle/subst.rs +++ b/src/librustc/middle/subst.rs @@ -317,7 +317,7 @@ impl VecPerParamSpace { /// /// Unlike the `extend` method in `Vec`, this should not be assumed /// to be a cheap operation (even when amortized over many calls). - pub fn extend>(&mut self, space: ParamSpace, mut values: I) { + pub fn extend>(&mut self, space: ParamSpace, values: I) { // This could be made more efficient, obviously. for item in values { self.push(space, item); diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs index 91eec4e4c45..000572cdd40 100644 --- a/src/librustc/middle/traits/select.rs +++ b/src/librustc/middle/traits/select.rs @@ -295,7 +295,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { fn evaluate_predicates_recursively<'a,'o,I>(&mut self, stack: Option<&TraitObligationStack<'o, 'tcx>>, - mut predicates: I) + predicates: I) -> EvaluationResult<'tcx> where I : Iterator>, 'tcx:'a { diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index 145cf46ad9d..c94ec112ac2 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -265,7 +265,7 @@ pub fn sanitize(s: &str) -> String { return result; } -pub fn mangle>(mut path: PI, +pub fn mangle>(path: PI, hash: Option<&str>) -> String { // Follow C++ namespace-mangling style, see // http://en.wikipedia.org/wiki/Name_mangling for more info. @@ -1055,10 +1055,10 @@ fn add_local_native_libraries(cmd: &mut Command, sess: &Session) { let libs = sess.cstore.get_used_libraries(); let libs = libs.borrow(); - let mut staticlibs = libs.iter().filter_map(|&(ref l, kind)| { + let staticlibs = libs.iter().filter_map(|&(ref l, kind)| { if kind == cstore::NativeStatic {Some(l)} else {None} }); - let mut others = libs.iter().filter(|&&(_, kind)| { + let others = libs.iter().filter(|&&(_, kind)| { kind != cstore::NativeStatic }); diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs index c46c2b7e6dd..49959d83135 100644 --- a/src/librustc_trans/lib.rs +++ b/src/librustc_trans/lib.rs @@ -23,8 +23,6 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/")] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap - #![feature(alloc)] #![feature(box_syntax)] #![feature(collections)] diff --git a/src/librustc_trans/trans/debuginfo.rs b/src/librustc_trans/trans/debuginfo.rs index 291a88d17c1..932386b06b4 100644 --- a/src/librustc_trans/trans/debuginfo.rs +++ b/src/librustc_trans/trans/debuginfo.rs @@ -3848,7 +3848,7 @@ fn push_debuginfo_type_name<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, def_id: ast::DefId, qualified: bool, output: &mut String) { - ty::with_path(cx.tcx(), def_id, |mut path| { + ty::with_path(cx.tcx(), def_id, |path| { if qualified { if def_id.krate == ast::LOCAL_CRATE { output.push_str(crate_root_namespace(cx)); diff --git a/src/librustc_typeck/check/coercion.rs b/src/librustc_typeck/check/coercion.rs index 8bac89ac184..04a3f423dce 100644 --- a/src/librustc_typeck/check/coercion.rs +++ b/src/librustc_typeck/check/coercion.rs @@ -353,7 +353,7 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> { assert!(ty_substs_a.len() == ty_substs_b.len()); let mut result = None; - let mut tps = ty_substs_a.iter().zip(ty_substs_b.iter()).enumerate(); + let tps = ty_substs_a.iter().zip(ty_substs_b.iter()).enumerate(); for (i, (tp_a, tp_b)) in tps { if self.fcx.infcx().try(|_| self.subtype(*tp_a, *tp_b)).is_ok() { continue; diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index d80b8791c26..15954f69836 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -805,7 +805,7 @@ fn check_trait_on_unimplemented<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>, a.check_name("rustc_on_unimplemented") }) { if let Some(ref istring) = attr.value_str() { - let mut parser = Parser::new(istring.get()); + let parser = Parser::new(istring.get()); let types = generics.ty_params.as_slice(); for token in parser { match token { diff --git a/src/librustc_typeck/check/regionck.rs b/src/librustc_typeck/check/regionck.rs index 816edd92bf9..94414d842c9 100644 --- a/src/librustc_typeck/check/regionck.rs +++ b/src/librustc_typeck/check/regionck.rs @@ -854,7 +854,7 @@ fn constrain_callee(rcx: &mut Rcx, fn constrain_call<'a, I: Iterator>(rcx: &mut Rcx, call_expr: &ast::Expr, receiver: Option<&ast::Expr>, - mut arg_exprs: I, + arg_exprs: I, implicitly_ref_args: bool) { //! Invoked on every call site (i.e., normal calls, method calls, //! and overloaded operators). Constrains the regions which appear diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 4114e92a096..7dfa5298fb4 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -439,7 +439,7 @@ fn convert_associated_type<'a, 'tcx>(ccx: &CollectCtxt<'a, 'tcx>, fn convert_methods<'a,'tcx,'i,I>(ccx: &CollectCtxt<'a, 'tcx>, container: ImplOrTraitItemContainer, - mut ms: I, + ms: I, untransformed_rcvr_ty: Ty<'tcx>, rcvr_ty_generics: &ty::Generics<'tcx>, rcvr_visibility: ast::Visibility) @@ -1655,7 +1655,7 @@ fn enforce_impl_ty_params_are_constrained<'tcx>(tcx: &ty::ctxt<'tcx>, loop { let num_inputs = input_parameters.len(); - let mut projection_predicates = + let projection_predicates = impl_scheme.generics.predicates .iter() .filter_map(|predicate| { diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 68f5ec9c8c2..a07179b31bb 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -73,7 +73,6 @@ This API is completely unstable and subject to change. html_root_url = "http://doc.rust-lang.org/nightly/")] #![allow(non_camel_case_types)] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap #![feature(box_syntax)] #![feature(collections)] diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 511fa86685d..ee091d1786b 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -1416,7 +1416,7 @@ impl IntoIterator for HashMap { type Iter = IntoIter; - fn into_iter(mut self) -> IntoIter { + fn into_iter(self) -> IntoIter { self.into_iter() } } @@ -1575,7 +1575,7 @@ impl Extend<(K, V)> for HashMap S: HashState, H: hash::Hasher { - fn extend>(&mut self, mut iter: T) { + fn extend>(&mut self, iter: T) { for (k, v) in iter { self.insert(k, v); } diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index fef30a28208..ae9fb9bca77 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -636,7 +636,7 @@ impl Extend for HashSet S: HashState, H: hash::Hasher { - fn extend>(&mut self, mut iter: I) { + fn extend>(&mut self, iter: I) { for k in iter { self.insert(k); } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index f0981145af7..7a6e0682281 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -127,7 +127,6 @@ #![no_std] #![deny(missing_docs)] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap #[cfg(test)] #[macro_use] diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index e1006f23996..abf215988bb 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -597,7 +597,7 @@ pub fn mkdir_recursive(path: &Path, mode: FilePermission) -> IoResult<()> { return Ok(()) } - let mut comps = path.components(); + let comps = path.components(); let mut curpath = path.root_path().unwrap_or(Path::new(".")); for c in comps { diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs index 1a898e73cda..b30af10986b 100644 --- a/src/libstd/sys/common/wtf8.rs +++ b/src/libstd/sys/common/wtf8.rs @@ -366,7 +366,7 @@ impl FromIterator for Wtf8Buf { /// This replaces surrogate code point pairs with supplementary code points, /// like concatenating ill-formed UTF-16 strings effectively would. impl Extend for Wtf8Buf { - fn extend>(&mut self, mut iterator: T) { + fn extend>(&mut self, iterator: T) { let (low, _high) = iterator.size_hint(); // Lower bound of one byte per code point (ASCII only) self.bytes.reserve(low); diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index e5cd6f63690..301a18892d8 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -373,7 +373,7 @@ impl fmt::Display for StabilityLevel { fn find_stability_generic<'a, AM: AttrMetaMethods, I: Iterator> - (diagnostic: &SpanHandler, mut attrs: I, item_sp: Span) + (diagnostic: &SpanHandler, attrs: I, item_sp: Span) -> (Option, Vec<&'a AM>) { let mut stab: Option = None; diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 73424136cfb..74d89d1d6ff 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -23,8 +23,6 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/")] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap - #![feature(box_syntax)] #![feature(collections)] #![feature(core)] diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs index 12f871b2782..a6c92c03743 100644 --- a/src/libsyntax/util/small_vector.rs +++ b/src/libsyntax/util/small_vector.rs @@ -38,7 +38,7 @@ impl FromIterator for SmallVector { } impl Extend for SmallVector { - fn extend>(&mut self, mut iter: I) { + fn extend>(&mut self, iter: I) { for val in iter { self.push(val); } diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 25377e3afa1..c5c84396e18 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -32,8 +32,6 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/")] -#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap - #![feature(asm, slicing_syntax)] #![feature(box_syntax)] #![feature(collections)] diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index 0ce115a0c1f..ebd86dbf61c 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -332,7 +332,7 @@ pub fn winsorize(samples: &mut [T], pct: T) { /// Returns a HashMap with the number of occurrences of every element in the /// sequence that the iterator exposes. -pub fn freq_count(mut iter: T) -> hash_map::HashMap +pub fn freq_count(iter: T) -> hash_map::HashMap where T: Iterator, U: Eq + Clone + Hash { let mut map: hash_map::HashMap = hash_map::HashMap::new(); -- cgit 1.4.1-3-g733a5