]> git.lizzy.rs Git - rust.git/commitdiff
Cleanup code
authorAaron Hill <aa1ronham@gmail.com>
Thu, 3 Jan 2019 02:21:47 +0000 (21:21 -0500)
committerAaron Hill <aa1ronham@gmail.com>
Fri, 4 Jan 2019 02:58:57 +0000 (21:58 -0500)
src/librustc/traits/select.rs

index 75ed8ddcefea4f9eceab16aad9ca40b3066e8336..e5eb8e24a427d5a6647213f99e89c151522a462c 100644 (file)
@@ -694,9 +694,6 @@ fn evaluate_predicate_recursively<'o>(
             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 @@ fn evaluate_candidate<'o>(
             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),
             }