Plumb inference obligations through selection

rust-lang · May 12, 2016 · f52b655 · f52b655
1 parent ec7c483
commit f52b655
Show file tree

Hide file tree

Showing 3 changed files with 126 additions and 66 deletions.
diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs
@@ -582,6 +582,18 @@ impl<'tcx, N> Vtable<'tcx, N> {
         }
     }
 
+    fn nested_obligations_mut(&mut self) -> &mut Vec<N> {
+        match self {
+            &mut VtableImpl(ref mut i) => &mut i.nested,
+            &mut VtableParam(ref mut n) => n,
+            &mut VtableBuiltin(ref mut i) => &mut i.nested,
+            &mut VtableDefaultImpl(ref mut d) => &mut d.nested,
+            &mut VtableClosure(ref mut c) => &mut c.nested,
+            &mut VtableObject(ref mut d) => &mut d.nested,
+            &mut VtableFnPointer(ref mut d) => &mut d.nested,
+        }
+    }
+
     pub fn map<M, F>(self, f: F) -> Vtable<'tcx, M> where F: FnMut(N) -> M {
         match self {
             VtableImpl(i) => VtableImpl(VtableImplData {