Skip to content

Commit ac26419

Browse files
committed
Address style nits
1 parent 6aa9145 commit ac26419

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/librustc/ty/mod.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,14 @@ pub trait NodeIdTree {
290290
impl<'a> NodeIdTree for ast_map::Map<'a> {
291291
fn is_descendant_of(&self, node: NodeId, ancestor: NodeId) -> bool {
292292
let mut node_ancestor = node;
293-
loop {
294-
if node_ancestor == ancestor { return true }
293+
while node_ancestor != ancestor {
295294
let node_ancestor_parent = self.get_module_parent(node_ancestor);
296-
if node_ancestor_parent == node_ancestor { return false }
295+
if node_ancestor_parent == node_ancestor {
296+
return false;
297+
}
297298
node_ancestor = node_ancestor_parent;
298299
}
300+
true
299301
}
300302
}
301303

src/librustc_resolve/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1125,14 +1125,14 @@ impl<'a, 'tcx> ty::NodeIdTree for Resolver<'a, 'tcx> {
11251125
fn is_descendant_of(&self, node: NodeId, ancestor: NodeId) -> bool {
11261126
let ancestor = self.ast_map.local_def_id(ancestor);
11271127
let mut module = *self.module_map.get(&node).unwrap();
1128-
loop {
1129-
if module.def_id() == Some(ancestor) { return true; }
1128+
while module.def_id() != Some(ancestor) {
11301129
let module_parent = match self.get_nearest_normal_module_parent(module) {
11311130
Some(parent) => parent,
11321131
None => return false,
11331132
};
11341133
module = module_parent;
11351134
}
1135+
true
11361136
}
11371137
}
11381138

0 commit comments

Comments
 (0)