mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Address style nits

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-04-27 19:30:16 +00:00
parent 6aa9145753
commit ac264196e2
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librustc/ty/mod.rs
View file

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

4
src/librustc_resolve/lib.rs
View file

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