user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup code

Browse source
This commit is contained in:
Aaron Hill 2019-01-02 21:21:47 -05:00
parent b1a8da6e61
commit 9a64d79365
No known key found for this signature in database
GPG key ID: B4087E510E98B164
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc/traits/select.rs
View file

@ -694,9 +694,6 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
None => self.check_recursion_limit(&obligation, &obligation)?
}
//self.check_recursion_limit(&obligation, previous_stack.head()
// .map_or(&obligation, |s| s.obligation))?;
match obligation.predicate {
ty::Predicate::Trait(ref t) => {
debug_assert!(!t.has_escaping_bound_vars());
@ -1023,10 +1020,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
match this.confirm_candidate(stack.obligation, candidate) {
Ok(selection) => this.evaluate_predicates_recursively(
stack.list(),
selection.nested_obligations().into_iter().map(|o| {
//o.recursion_depth = 0;
o
})
selection.nested_obligations().into_iter()
),
Err(..) => Ok(EvaluatedToErr),
}