about summary refs log tree commit diff
path: root/src/librustc/middle/cfg/construct.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/librustc/middle/cfg/construct.rs')
-rw-r--r--src/librustc/middle/cfg/construct.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc/middle/cfg/construct.rs b/src/librustc/middle/cfg/construct.rs
index a262aa5445e..c1a44cc56da 100644
--- a/src/librustc/middle/cfg/construct.rs
+++ b/src/librustc/middle/cfg/construct.rs
@@ -53,7 +53,7 @@ pub fn construct(tcx: ty::ctxt,
 impl CFGBuilder {
     fn block(&mut self, blk: &ast::Block, pred: CFGIndex) -> CFGIndex {
         let mut stmts_exit = pred;
-        for blk.stmts.iter().advance |&stmt| {
+        foreach &stmt in blk.stmts.iter() {
             stmts_exit = self.stmt(stmt, stmts_exit);
         }
 
@@ -151,7 +151,7 @@ impl CFGBuilder {
             self.pat(pats[0], pred)
         } else {
             let collect = self.add_dummy_node([]);
-            for pats.iter().advance |&pat| {
+            foreach &pat in pats.iter() {
                 let pat_exit = self.pat(pat, pred);
                 self.add_contained_edge(pat_exit, collect);
             }
@@ -297,7 +297,7 @@ impl CFGBuilder {
 
                 let expr_exit = self.add_node(expr.id, []);
                 let mut guard_exit = discr_exit;
-                for arms.iter().advance |arm| {
+                foreach arm in arms.iter() {
                     guard_exit = self.opt_expr(arm.guard, guard_exit); // 2
                     let pats_exit = self.pats_any(arm.pats, guard_exit); // 3
                     let body_exit = self.block(&arm.body, pats_exit);    // 4
@@ -460,7 +460,7 @@ impl CFGBuilder {
         assert!(!self.exit_map.contains_key(&id));
         let node = self.graph.add_node(CFGNodeData {id: id});
         self.exit_map.insert(id, node);
-        for preds.iter().advance |&pred| {
+        foreach &pred in preds.iter() {
             self.add_contained_edge(pred, node);
         }
         node
@@ -498,7 +498,7 @@ impl CFGBuilder {
             Some(_) => {
                 match self.tcx.def_map.find(&expr.id) {
                     Some(&ast::def_label(loop_id)) => {
-                        for self.loop_scopes.iter().advance |l| {
+                        foreach l in self.loop_scopes.iter() {
                             if l.loop_id == loop_id {
                                 return *l;
                             }