squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

correct depth initialisation

Browse source
This commit is contained in:
gaurikholkar 2017-09-11 23:58:29 +05:30
parent b2d869dc80
commit 54af57018b
1 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/librustc/infer/error_reporting/anon_anon_conflict.rs
View file

@ -192,7 +192,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
hir_map: &self.tcx.hir,
bound_region: *br,
found_type: None,
depth: 0,
depth: 1,
};
nested_visitor.visit_ty(arg);
nested_visitor.found_type
@ -233,6 +233,14 @@ impl<'a, 'gcx, 'tcx> Visitor<'gcx> for FindNestedTypeVisitor<'a, 'gcx, 'tcx> {
};
match arg.node {
hir::TyBareFn(ref fndecl) => {
self.depth += 1;
intravisit::walk_ty(self, arg);
self.depth -= 1;
return;
}
hir::TyRptr(ref lifetime, _) => {
match self.infcx.tcx.named_region_map.defs.get(&lifetime.id) {
// the lifetime of the TyRptr
@ -266,38 +274,13 @@ impl<'a, 'gcx, 'tcx> Visitor<'gcx> for FindNestedTypeVisitor<'a, 'gcx, 'tcx> {
}
}
hir::TyBareFn(ref fndecl) => {
fndecl.lifetimes.iter().map(|lf| {
debug!("arg we are handling is...{:?}",arg);
match self.infcx.tcx.named_region_map.defs.get(&lf.lifetime.id) {
Some(&rl::Region::LateBoundAnon(debuijn_index, anon_index)) => {
debug!("debuijn_index.depth ={:?} self.depth = {:?} anon_index ={:?} br_index={:?}",
debuijn_index.depth, self.depth, anon_index, br_index);
if debuijn_index.depth == self.depth && anon_index == br_index {
debug!("arg is {:?}",Some(arg));
self.found_type = Some(arg);
return; // we can stop visiting now
}
}
Some(&rl::Region::Static) |
Some(&rl::Region::EarlyBound(_, _)) |
Some(&rl::Region::LateBound(_, _)) |
Some(&rl::Region::Free(_, _)) |
None => {
debug!("no arg found");
}
}
}).next();}
_ => {}
}
// walk the embedded contents: e.g., if we are visiting `Vec<&Foo>`,
// go on to visit `&Foo`
self.depth += 1;
debug!("depth is {:?}",self.depth);
debug!("depth is {:?}", self.depth);
intravisit::walk_ty(self, arg);
self.depth += 1;
}
}
@ -325,7 +308,6 @@ impl<'a, 'gcx, 'tcx> Visitor<'gcx> for TyPathVisitor<'a, 'gcx, 'tcx> {
_ => return,
};
match self.infcx.tcx.named_region_map.defs.get(&lifetime.id) {
// the lifetime of the TyPath!
Some(&rl::Region::LateBoundAnon(debuijn_index, anon_index)) => {