---

yaml
---
r: 185007
b: refs/heads/snap-stage3
c: d523acb
h: refs/heads/master
i:
  185005: 1b8326c
  185003: f1fabee
  184999: aeb3f1a
  184991: d50e697
v: v3

Author: flaper87

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: f0f7ca27de6b4e03f30012656dad270cda55a363
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4b09209efea1ef7275b34ff3b9d3c4859aa45c8f
+refs/heads/snap-stage3: d523acb495eaacd76d4297362c98c571cae87089
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/middle/traits/mod.rs

@@ -265,7 +265,7 @@ pub struct VtableImplData<'tcx, N> {
 #[derive(Debug,Clone)]
 pub struct VtableDefaultTraitData<N> {
     pub trait_def_id: ast::DefId,
-    pub nested: subst::VecPerParamSpace<N>
+    pub nested: Vec<N>
 }
 
 #[derive(Debug,Clone)]
@@ -594,7 +594,7 @@ impl<N> VtableDefaultTraitData<N> {
     {
         VtableDefaultTraitData {
             trait_def_id: self.trait_def_id,
-            nested: self.nested.map(op)
+            nested: self.nested.iter().map(op).collect()
         }
     }
 
@@ -604,7 +604,7 @@ impl<N> VtableDefaultTraitData<N> {
         let VtableDefaultTraitData { trait_def_id, nested } = self;
         VtableDefaultTraitData {
             trait_def_id: trait_def_id,
-            nested: nested.map_move(op)
+            nested: nested.into_iter().map(op).collect()
         }
     }
 }

branches/snap-stage3/src/librustc/middle/traits/select.rs

@@ -1918,7 +1918,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
             Err(ErrorReported) => Vec::new()
         };
 
-        let obligations = VecPerParamSpace::new(obligations, Vec::new(), Vec::new());
         debug!("vtable_default_impl_data: obligations={}", obligations.repr(self.tcx()));
 
         VtableDefaultTraitData {