---

yaml
---
r: 167837
b: refs/heads/master
c: fc7d8fa
h: refs/heads/master
i:
  167835: 5bae6a9
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 45468f37c85adb6e1339af33c2f18770b4ac9dac
+refs/heads/master: fc7d8faba87716bbcaa43c3747fb8a98dc0c041a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

trunk/src/librustc/middle/traits/select.rs

@@ -338,24 +338,21 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
             }
 
             ty::Predicate::Projection(ref data) => {
-                let result = self.infcx.probe(|_| {
+                self.infcx.probe(|_| {
                     let project_obligation = obligation.with(data.clone());
-                    project::poly_project_and_unify_type(self, &project_obligation)
-                });
-                match result {
-                    Ok(Some(_subobligations)) => {
-                        // TODO we should evaluate _subobligations, but doing so leads to an ICE
-                        // self.evaluate_predicates_recursively(previous_stack,
-                        //                                      subobligations.iter())
-                        EvaluatedToAmbig
-                    }
-                    Ok(None) => {
-                        EvaluatedToAmbig
-                    }
-                    Err(_) => {
-                        EvaluatedToErr(Unimplemented)
+                    match project::poly_project_and_unify_type(self, &project_obligation) {
+                        Ok(Some(subobligations)) => {
+                            self.evaluate_predicates_recursively(previous_stack,
+                                                                 subobligations.iter())
+                        }
+                        Ok(None) => {
+                            EvaluatedToAmbig
+                        }
+                        Err(_) => {
+                            EvaluatedToErr(Unimplemented)
+                        }
                     }
-                }
+                })
             }
         }
     }