---

yaml
---
r: 165408
b: refs/heads/master
c: b4f54f9
h: refs/heads/master
v: v3

Author: Aatch

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9115b319c31d644f01387c9fe3eff9a498941090
+refs/heads/master: b4f54f96df60337cb939f6f753a1cc6181e70f4b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 658529467d9d69ac9e09cacf98a6d61d781c2c76
 refs/heads/try: aee614fc4973262a5a68efc643026e2b1458d65b

trunk/src/librustc/middle/cfg/mod.rs

@@ -51,9 +51,6 @@ impl CFG {
     }
 
     pub fn node_is_reachable(&self, id: ast::NodeId) -> bool {
-        for node in self.graph.depth_traverse(self.entry) {
-            if node.id == id { return true }
-        }
-        return false;
+        self.graph.depth_traverse(self.entry).any(|node| node.id == id)
     }
 }

trunk/src/librustc/middle/graph.rs

@@ -313,12 +313,10 @@ pub struct DepthFirstTraversal<'g, N:'g, E:'g> {
 
 impl<'g, N, E> Iterator<&'g N> for DepthFirstTraversal<'g, N, E> {
     fn next(&mut self) -> Option<&'g N> {
-        while self.stack.len() > 0 {
-            let idx = self.stack.pop().unwrap();
-            if self.visited.contains(&idx.node_id()) {
+        while let Some(idx) = self.stack.pop() {
+            if self.visited.insert(idx.node_id()) {
                 continue;
             }
-            self.visited.insert(idx.node_id());
             self.graph.each_outgoing_edge(idx, |_, e| -> bool {
                 if !self.visited.contains(&e.target().node_id()) {
                     self.stack.push(e.target());

trunk/src/librustc_trans/trans/base.rs

@@ -1468,7 +1468,7 @@ pub fn new_fn_ctxt<'a, 'tcx>(ccx: &'a CrateContext<'a, 'tcx>,
     let debug_context = debuginfo::create_function_debug_context(ccx, id, param_substs, llfndecl);
     let (blk_id, cfg) = build_cfg(ccx.tcx(), id);
     let nested_returns = if let Some(ref cfg) = cfg {
-       has_nested_returns(ccx.tcx(), cfg, blk_id)
+        has_nested_returns(ccx.tcx(), cfg, blk_id)
     } else {
         false
     };