Skip to content

Instantly share code, notes, and snippets.

/gist:21b9065e522dafa74f78 Secret
Created Jul 24, 2014

Embed
What would you like to do?
Download ZIP
Raw
gistfile1.diff
diff --git a/src/libcollections/treemap.rs b/src/libcollections/treemap.rs
index 8c24326..1355c37 100644
--- a/src/libcollections/treemap.rs
+++ b/src/libcollections/treemap.rs
@@ -993,7 +993,7 @@ fn remove<K: Ord, V>(node: &mut Option<Box<TreeNode<K, V>>>,
fn heir_swap<K: Ord, V>(node: &mut Box<TreeNode<K, V>>,
child: &mut Option<Box<TreeNode<K, V>>>) {
// *could* be done without recursion, but it won't borrow check
- for x in child.mut_iter() {
+ for x in child.as_mut().iter() {
if x.right.is_some() {
heir_swap(node, &mut x.right);
} else {
@@ -1048,18 +1048,18 @@ fn remove<K: Ord, V>(node: &mut Option<Box<TreeNode<K, V>>>,
save.level -= 1;
if right_level > save.level {
- for x in save.right.mut_iter() { x.level = save.level }
+ for x in save.right.as_mut().iter() { x.level = save.level }
}
skew(save);
- for right in save.right.mut_iter() {
+ for right in save.right.as_mut().iter() {
skew(right);
- for x in right.right.mut_iter() { skew(x) }
+ for x in right.right.as_mut().iter() { skew(x) }
}
split(save);
- for x in save.right.mut_iter() { split(x) }
+ for x in save.right.as_mut().iter() { split(x) }
}
return ret;
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index 7b84c00..adace44 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -359,7 +359,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.move_iter() {
+ for c in sign.iter() {
let mut b = [0, ..4];
let n = c.encode_utf8(b);
try!(f.buf.write(b.slice_to(n)));
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 7706d01..fd936ef 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -1723,7 +1723,7 @@ impl<'a, A, T: Iterator<A>, B, U: Iterator<B>> Iterator<B> for FlatMap<'a, A, T,
#[inline]
fn next(&mut self) -> Option<B> {
loop {
- for inner in self.frontiter.mut_iter() {
+ for inner in self.frontiter.as_mut().iter() {
for x in *inner {
return Some(x)
}
@@ -1754,7 +1754,7 @@ impl<'a,
#[inline]
fn next_back(&mut self) -> Option<B> {
loop {
- for inner in self.backiter.mut_iter() {
+ for inner in self.backiter.as_mut().iter() {
match inner.next_back() {
None => (),
y => return y
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index b8612ed..1179ec0 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -335,19 +335,21 @@ impl<T> Option<T> {
// Iterator constructors
/////////////////////////////////////////////////////////////////////////
- /// Returns an iterator over the possibly contained value.
+ /// Returns a consuming iterator over the possibly contained value.
#[inline]
- pub fn iter<'r>(&'r self) -> Item<&'r T> {
- Item{opt: self.as_ref()}
+ pub fn iter(self) -> Item<T> {
+ Item{opt: self}
}
/// Returns a mutable iterator over the possibly contained value.
+ #[deprecated="Replaced by .as_mut().iter()"]
#[inline]
pub fn mut_iter<'r>(&'r mut self) -> Item<&'r mut T> {
Item{opt: self.as_mut()}
}
/// Returns a consuming iterator over the possibly contained value.
+ #[deprecated="Renamed to .iter()"]
#[inline]
pub fn move_iter(self) -> Item<T> {
Item{opt: self}
@@ -532,8 +534,7 @@ impl<T> Default for Option<T> {
/// An `Option` iterator that yields either one or zero elements
///
-/// The `Item` iterator is returned by the `iter`, `mut_iter` and `move_iter`
-/// methods on `Option`.
+/// The `Item` iterator is returned by the `iter` method on `Option`.
#[deriving(Clone)]
pub struct Item<A> {
opt: Option<A>
diff --git a/src/libcoretest/option.rs b/src/libcoretest/option.rs
index 776637f..64cd622 100644
--- a/src/libcoretest/option.rs
+++ b/src/libcoretest/option.rs
@@ -211,7 +211,7 @@ fn test_mut_iter() {
let mut x = Some(val);
{
- let mut it = x.mut_iter();
+ let mut it = x.as_mut().iter();
assert_eq!(it.size_hint(), (1, Some(1)));
diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs
index 7227154..0a364c8 100644
--- a/src/librustc/middle/astencode.rs
+++ b/src/librustc/middle/astencode.rs
@@ -1036,7 +1036,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &ty in tcx.node_types.borrow().find(&(id as uint)).iter() {
+ for ty in tcx.node_types.borrow().find(&(id as uint)).iter() {
ebml_w.tag(c::tag_table_node_type, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1045,7 +1045,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &item_substs in tcx.item_substs.borrow().find(&id).iter() {
+ for item_substs in tcx.item_substs.borrow().find(&id).iter() {
ebml_w.tag(c::tag_table_item_subst, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1054,7 +1054,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &fv in tcx.freevars.borrow().find(&id).iter() {
+ for fv in tcx.freevars.borrow().find(&id).iter() {
ebml_w.tag(c::tag_table_freevars, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1066,7 +1066,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
}
let lid = ast::DefId { krate: ast::LOCAL_CRATE, node: id };
- for &pty in tcx.tcache.borrow().find(&lid).iter() {
+ for pty in tcx.tcache.borrow().find(&lid).iter() {
ebml_w.tag(c::tag_table_tcache, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1075,7 +1075,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &type_param_def in tcx.ty_param_defs.borrow().find(&id).iter() {
+ for type_param_def in tcx.ty_param_defs.borrow().find(&id).iter() {
ebml_w.tag(c::tag_table_param_defs, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1085,7 +1085,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
}
let method_call = MethodCall::expr(id);
- for &method in tcx.method_map.borrow().find(&method_call).iter() {
+ for method in tcx.method_map.borrow().find(&method_call).iter() {
ebml_w.tag(c::tag_table_method_map, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1094,7 +1094,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &dr in tcx.vtable_map.borrow().find(&method_call).iter() {
+ for dr in tcx.vtable_map.borrow().find(&method_call).iter() {
ebml_w.tag(c::tag_table_vtable_map, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1103,12 +1103,12 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &adj in tcx.adjustments.borrow().find(&id).iter() {
+ for adj in tcx.adjustments.borrow().find(&id).iter() {
match *adj {
ty::AutoDerefRef(adj) => {
for autoderef in range(0, adj.autoderefs) {
let method_call = MethodCall::autoderef(id, autoderef);
- for &method in tcx.method_map.borrow().find(&method_call).iter() {
+ for method in tcx.method_map.borrow().find(&method_call).iter() {
ebml_w.tag(c::tag_table_method_map, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1118,7 +1118,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &dr in tcx.vtable_map.borrow().find(&method_call).iter() {
+ for dr in tcx.vtable_map.borrow().find(&method_call).iter() {
ebml_w.tag(c::tag_table_vtable_map, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1131,7 +1131,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
}
ty::AutoObject(..) => {
let method_call = MethodCall::autoobject(id);
- for &method in tcx.method_map.borrow().find(&method_call).iter() {
+ for method in tcx.method_map.borrow().find(&method_call).iter() {
ebml_w.tag(c::tag_table_method_map, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1140,7 +1140,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
})
}
- for &dr in tcx.vtable_map.borrow().find(&method_call).iter() {
+ for dr in tcx.vtable_map.borrow().find(&method_call).iter() {
ebml_w.tag(c::tag_table_vtable_map, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
@@ -1167,7 +1167,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
ebml_w.tag(c::tag_table_unboxed_closure_type, |ebml_w| {
ebml_w.id(id);
ebml_w.tag(c::tag_table_val, |ebml_w| {
- ebml_w.emit_closure_type(ecx, *unboxed_closure_type)
+ ebml_w.emit_closure_type(ecx, unboxed_closure_type)
})
})
}
diff --git a/src/librustc/middle/borrowck/move_data.rs b/src/librustc/middle/borrowck/move_data.rs
index 6ec3f82..5b0faee 100644
--- a/src/librustc/middle/borrowck/move_data.rs
+++ b/src/librustc/middle/borrowck/move_data.rs
@@ -595,7 +595,7 @@ impl<'a> FlowedMoveData<'a> {
self.dfcx_moves.each_gen_bit(id, |move_index| {
let move = self.move_data.moves.borrow();
let move = move.get(move_index);
- if move.path == **loan_path_index {
+ if move.path == *loan_path_index {
ret = Some(move.kind);
false
} else {
@@ -648,7 +648,7 @@ impl<'a> FlowedMoveData<'a> {
ret = false;
}
} else {
- for &loan_path_index in opt_loan_path_index.iter() {
+ for loan_path_index in opt_loan_path_index.iter() {
let cont = self.move_data.each_base_path(moved_path, |p| {
if p == loan_path_index {
// Scenario 3: some extension of `loan_path`
diff --git a/src/librustc/middle/cfg/construct.rs b/src/librustc/middle/cfg/construct.rs
index 208a9d0..df507e9 100644
--- a/src/librustc/middle/cfg/construct.rs
+++ b/src/librustc/middle/cfg/construct.rs
@@ -140,7 +140,7 @@ impl<'a> CFGBuilder<'a> {
let pre_exit =
self.pats_all(pre.iter().map(|p| *p), pred);
let vec_exit =
- self.pats_all(vec.iter().map(|p| *p), pre_exit);
+ self.pats_all(vec.iter(), pre_exit);
let post_exit =
self.pats_all(post.iter().map(|p| *p), vec_exit);
self.add_node(pat.id, [post_exit])
@@ -483,7 +483,7 @@ impl<'a> CFGBuilder<'a> {
pred: CFGIndex) -> CFGIndex {
//! Constructs graph for `opt_expr` evaluated, if Some
- opt_expr.iter().fold(pred, |p, &e| self.expr(e, p))
+ opt_expr.iter().fold(pred, |p, e| self.expr(e, p))
}
fn straightline(&mut self,
diff --git a/src/librustc/middle/check_const.rs b/src/librustc/middle/check_const.rs
index 283d667..b448d86 100644
--- a/src/librustc/middle/check_const.rs
+++ b/src/librustc/middle/check_const.rs
@@ -51,7 +51,7 @@ fn check_item(v: &mut CheckCrateVisitor, it: &Item, _is_const: bool) {
ItemEnum(ref enum_definition, _) => {
for var in (*enum_definition).variants.iter() {
for ex in var.node.disr_expr.iter() {
- v.visit_expr(&**ex, true);
+ v.visit_expr(&*ex, true);
}
}
}
diff --git a/src/librustc/middle/expr_use_visitor.rs b/src/librustc/middle/expr_use_visitor.rs
index b911e63..70410a4 100644
--- a/src/librustc/middle/expr_use_visitor.rs
+++ b/src/librustc/middle/expr_use_visitor.rs
@@ -341,7 +341,7 @@ impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> {
self.consume_expr(&**cond_expr);
self.walk_block(&**then_blk);
for else_expr in opt_else_expr.iter() {
- self.consume_expr(&**else_expr);
+ self.consume_expr(&*else_expr);
}
}
@@ -416,7 +416,7 @@ impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> {
ast::ExprRet(ref opt_expr) => {
for expr in opt_expr.iter() {
- self.consume_expr(&**expr);
+ self.consume_expr(&*expr);
}
}
@@ -583,7 +583,7 @@ impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> {
}
for tail_expr in blk.expr.iter() {
- self.consume_expr(&**tail_expr);
+ self.consume_expr(&*tail_expr);
}
}
@@ -778,7 +778,7 @@ impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> {
}
for guard in arm.guard.iter() {
- self.consume_expr(&**guard);
+ self.consume_expr(&*guard);
}
self.consume_expr(&*arm.body);
diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs
index 737b952..a37297c 100644
--- a/src/librustc/middle/liveness.rs
+++ b/src/librustc/middle/liveness.rs
@@ -922,7 +922,7 @@ impl<'a> Liveness<'a> {
succ: LiveNode)
-> LiveNode {
opt_expr.iter().fold(succ, |succ, expr| {
- self.propagate_through_expr(&**expr, succ)
+ self.propagate_through_expr(&*expr, succ)
})
}
@@ -1566,10 +1566,10 @@ impl<'a> Liveness<'a> {
if is_assigned {
self.ir.tcx.sess.add_lint(lint::builtin::UNUSED_VARIABLE, id, sp,
format!("variable `{}` is assigned to, but never used",
- *name));
+ name));
} else {
self.ir.tcx.sess.add_lint(lint::builtin::UNUSED_VARIABLE, id, sp,
- format!("unused variable: `{}`", *name));
+ format!("unused variable: `{}`", name));
}
}
true
@@ -1587,7 +1587,7 @@ impl<'a> Liveness<'a> {
let r = self.should_warn(var);
for name in r.iter() {
self.ir.tcx.sess.add_lint(lint::builtin::DEAD_ASSIGNMENT, id, sp,
- format!("value assigned to `{}` is never read", *name));
+ format!("value assigned to `{}` is never read", name));
}
}
}
diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs
index baf7f2d..82797dd 100644
--- a/src/librustc/middle/mem_categorization.rs
+++ b/src/librustc/middle/mem_categorization.rs
@@ -1125,9 +1125,9 @@ impl<'t,TYPER:Typer> MemCategorizationContext<'t,TYPER> {
|x,y,z| op(x,y,z)));
}
for slice_pat in slice.iter() {
- let slice_ty = if_ok!(self.pat_ty(&**slice_pat));
+ let slice_ty = if_ok!(self.pat_ty(&*slice_pat));
let slice_cmt = self.cat_rvalue_node(pat.id(), pat.span(), slice_ty);
- if_ok!(self.cat_pattern(slice_cmt, &**slice_pat, |x,y,z| op(x,y,z)));
+ if_ok!(self.cat_pattern(slice_cmt, &*slice_pat, |x,y,z| op(x,y,z)));
}
for after_pat in after.iter() {
if_ok!(self.cat_pattern(elt_cmt.clone(), &**after_pat, |x,y,z| op(x,y,z)));
diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs
index 822a43f..1d85e62 100644
--- a/src/librustc/middle/region.rs
+++ b/src/librustc/middle/region.rs
@@ -396,7 +396,7 @@ fn record_superlifetime(visitor: &mut RegionResolutionVisitor,
cx: Context,
child_id: ast::NodeId,
_sp: Span) {
- for &parent_id in cx.parent.iter() {
+ for parent_id in cx.parent.iter() {
visitor.region_maps.record_encl_scope(child_id, parent_id);
}
}
@@ -673,7 +673,7 @@ fn resolve_local(visitor: &mut RegionResolutionVisitor,
ast::PatVec(ref pats1, ref pats2, ref pats3) => {
pats1.iter().any(|p| is_binding_pat(&**p)) ||
- pats2.iter().any(|p| is_binding_pat(&**p)) ||
+ pats2.iter().any(|p| is_binding_pat(&*p)) ||
pats3.iter().any(|p| is_binding_pat(&**p))
}
diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs
index 0fb3778..d94fec5 100644
--- a/src/librustc/middle/resolve.rs
+++ b/src/librustc/middle/resolve.rs
@@ -1097,7 +1097,7 @@ impl<'a> Resolver<'a> {
{
let r = child.span_for_namespace(ns);
for sp in r.iter() {
- self.session.span_note(*sp,
+ self.session.span_note(sp,
format!("first definition of {} `{}` here",
namespace_error_to_string(duplicate_type),
token::get_ident(name)).as_slice());
@@ -1550,7 +1550,7 @@ impl<'a> Resolver<'a> {
ViewItemExternCrate(name, _, node_id) => {
// n.b. we don't need to look at the path option here, because cstore already did
- for &crate_id in self.session.cstore
+ for crate_id in self.session.cstore
.find_extern_mod_stmt_cnum(node_id).iter() {
let def_id = DefId { krate: crate_id, node: 0 };
self.external_exports.insert(def_id);
@@ -3649,7 +3649,7 @@ impl<'a> Resolver<'a> {
// resolve the discriminator expr
// as a constant
self.with_constant_rib(|this| {
- this.resolve_expr(&**dis_expr);
+ this.resolve_expr(&*dis_expr);
});
}
}
@@ -4160,7 +4160,7 @@ impl<'a> Resolver<'a> {
fn check_trait_method(&self, method: &Method) {
// If there is a TraitRef in scope for an impl, then the method must be in the trait.
- for &(did, ref trait_ref) in self.current_trait_ref.iter() {
+ for (did, ref trait_ref) in self.current_trait_ref.iter() {
let method_name = method.pe_ident().name;
if self.method_map.borrow().find(&(method_name, did)).is_none() {
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
index dbdb99d..554c2ad 100644
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@ -1678,7 +1678,7 @@ pub fn trans_closure(ccx: &CrateContext,
// This somewhat improves single-stepping experience in debugger.
unsafe {
let llreturn = fcx.llreturn.get();
- for &llreturn in llreturn.iter() {
+ for llreturn in llreturn.iter() {
llvm::LLVMMoveBasicBlockAfter(llreturn, bcx.llbb);
}
}
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index 99726da..04b8ad0 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -632,7 +632,7 @@ pub fn walk_pat(pat: &Pat, it: |&Pat| -> bool) -> bool {
}
PatVec(ref before, ref slice, ref after) => {
before.iter().all(|p| walk_pat(&**p, |p| it(p))) &&
- slice.iter().all(|p| walk_pat(&**p, |p| it(p))) &&
+ slice.iter().all(|p| walk_pat(&*p, |p| it(p))) &&
after.iter().all(|p| walk_pat(&**p, |p| it(p)))
}
PatMac(_) => fail!("attempted to analyze unexpanded pattern"),
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 123dcf3..d6ae80b 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -724,7 +724,7 @@ impl Visitor<()> for PatIdentFinder {
self.ident_accumulator.push(path1.node);
// visit optional subpattern of PatIdent:
for subpat in inner.iter() {
- self.visit_pat(&**subpat, ())
+ self.visit_pat(&*subpat, ())
}
}
// use the default traversal for non-PatIdents
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 305e67a..6555ac6 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -460,7 +460,7 @@ impl<'a> State<'a> {
pub fn print_opt_lifetime(&mut self,
lifetime: &Option<ast::Lifetime>) -> IoResult<()> {
- for l in lifetime.iter() {
+ for l in lifetime.as_ref().iter() {
try!(self.print_lifetime(l));
try!(self.nbsp());
}
@@ -1375,7 +1375,7 @@ impl<'a> State<'a> {
}
ast::ExprForLoop(ref pat, ref iter, ref blk, opt_ident) => {
for ident in opt_ident.iter() {
- try!(self.print_ident(*ident));
+ try!(self.print_ident(ident));
try!(self.word_space(":"));
}
try!(self.head("for"));
@@ -1388,7 +1388,7 @@ impl<'a> State<'a> {
}
ast::ExprLoop(ref blk, opt_ident) => {
for ident in opt_ident.iter() {
- try!(self.print_ident(*ident));
+ try!(self.print_ident(ident));
try!(self.word_space(":"));
}
try!(self.head("loop"));
@@ -1582,7 +1582,7 @@ impl<'a> State<'a> {
try!(word(&mut self.s, "break"));
try!(space(&mut self.s));
for ident in opt_ident.iter() {
- try!(self.print_ident(*ident));
+ try!(self.print_ident(ident));
try!(space(&mut self.s));
}
}
@@ -1590,7 +1590,7 @@ impl<'a> State<'a> {
try!(word(&mut self.s, "continue"));
try!(space(&mut self.s));
for ident in opt_ident.iter() {
- try!(self.print_ident(*ident));
+ try!(self.print_ident(ident));
try!(space(&mut self.s))
}
}
@@ -1863,13 +1863,13 @@ impl<'a> State<'a> {
|s, p| s.print_pat(&**p)));
for p in slice.iter() {
if !before.is_empty() { try!(self.word_space(",")); }
- match **p {
+ match *p {
ast::Pat { node: ast::PatWildMulti, .. } => {
// this case is handled by print_pat
}
_ => try!(word(&mut self.s, "..")),
}
- try!(self.print_pat(&**p));
+ try!(self.print_pat(&*p));
if !after.is_empty() { try!(self.word_space(",")); }
}
try!(self.commasep(Inconsistent,
@@ -1933,7 +1933,7 @@ impl<'a> State<'a> {
// self type and the args all in the same box.
try!(self.rbox(0u, Inconsistent));
let mut first = true;
- for &explicit_self in opt_explicit_self.iter() {
+ for explicit_self in opt_explicit_self.iter() {
let m = match explicit_self {
ast::SelfStatic => ast::MutImmutable,
_ => match decl.inputs.get(0).pat.node {
@@ -2205,7 +2205,7 @@ impl<'a> State<'a> {
ast::ViewItemExternCrate(id, ref optional_path, _) => {
try!(self.head("extern crate"));
try!(self.print_ident(id));
- for &(ref p, style) in optional_path.iter() {
+ for &(ref p, style) in optional_path.as_ref().iter() {
try!(space(&mut self.s));
try!(word(&mut self.s, "="));
try!(space(&mut self.s));
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index 3c6f06d..3207c36 100644
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -371,7 +371,7 @@ pub fn walk_ty<E: Clone, V: Visitor<E>>(visitor: &mut V, typ: &Ty, env: E) {
visitor.visit_ty(&*argument.ty, env.clone())
}
visitor.visit_ty(&*function_declaration.decl.output, env.clone());
- for bounds in function_declaration.bounds.iter() {
+ for bounds in function_declaration.bounds.as_ref().iter() {
walk_ty_param_bounds(visitor, bounds, env.clone())
}
visitor.visit_opt_lifetime_ref(
@@ -386,7 +386,7 @@ pub fn walk_ty<E: Clone, V: Visitor<E>>(visitor: &mut V, typ: &Ty, env: E) {
visitor.visit_ty(&*argument.ty, env.clone())
}
visitor.visit_ty(&*function_declaration.decl.output, env.clone());
- for bounds in function_declaration.bounds.iter() {
+ for bounds in function_declaration.bounds.as_ref().iter() {
walk_ty_param_bounds(visitor, bounds, env.clone())
}
walk_lifetime_decls(visitor, &function_declaration.lifetimes,
@@ -408,7 +408,7 @@ pub fn walk_ty<E: Clone, V: Visitor<E>>(visitor: &mut V, typ: &Ty, env: E) {
}
TyPath(ref path, ref bounds, id) => {
visitor.visit_path(path, id, env.clone());
- for bounds in bounds.iter() {
+ for bounds in bounds.as_ref().iter() {
walk_ty_param_bounds(visitor, bounds, env.clone())
}
}
@@ -448,7 +448,7 @@ pub fn walk_pat<E: Clone, V: Visitor<E>>(visitor: &mut V, pattern: &Pat, env: E)
match pattern.node {
PatEnum(ref path, ref children) => {
visitor.visit_path(path, pattern.id, env.clone());
- for children in children.iter() {
+ for children in children.as_ref().iter() {
for child in children.iter() {
visitor.visit_pat(&**child, env.clone())
}
@@ -487,7 +487,7 @@ pub fn walk_pat<E: Clone, V: Visitor<E>>(visitor: &mut V, pattern: &Pat, env: E)
visitor.visit_pat(&**prepattern, env.clone())
}
for slice_pattern in slice_pattern.iter() {
- visitor.visit_pat(&**slice_pattern, env.clone())
+ visitor.visit_pat(&*slice_pattern, env.clone())
}
for postpattern in postpatterns.iter() {
visitor.visit_pat(&**postpattern, env.clone())
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.