---

yaml
---
r: 277871
b: refs/heads/auto
c: ac26419
h: refs/heads/master
i:
  277869: d32c08d
  277867: b9db3c1
  277863: b5b7d5f
  277855: 50da089

Author: jseyfried

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 6aa91457535a1bc5433eec5f2bc5630e13b04895
+refs/heads/auto: ac264196e2f4c1f3de8b081f72dc78838e423085
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc/ty/mod.rs

@@ -290,12 +290,14 @@ pub trait NodeIdTree {
 impl<'a> NodeIdTree for ast_map::Map<'a> {
     fn is_descendant_of(&self, node: NodeId, ancestor: NodeId) -> bool {
         let mut node_ancestor = node;
-        loop {
-            if node_ancestor == ancestor { return true }
+        while node_ancestor != ancestor {
             let node_ancestor_parent = self.get_module_parent(node_ancestor);
-            if node_ancestor_parent == node_ancestor { return false }
+            if node_ancestor_parent == node_ancestor {
+                return false;
+            }
             node_ancestor = node_ancestor_parent;
         }
+        true
     }
 }
 

branches/auto/src/librustc_resolve/lib.rs

@@ -1125,14 +1125,14 @@ impl<'a, 'tcx> ty::NodeIdTree for Resolver<'a, 'tcx> {
     fn is_descendant_of(&self, node: NodeId, ancestor: NodeId) -> bool {
         let ancestor = self.ast_map.local_def_id(ancestor);
         let mut module = *self.module_map.get(&node).unwrap();
-        loop {
-            if module.def_id() == Some(ancestor) { return true; }
+        while module.def_id() != Some(ancestor) {
             let module_parent = match self.get_nearest_normal_module_parent(module) {
                 Some(parent) => parent,
                 None => return false,
             };
             module = module_parent;
         }
+        true
     }
 }