Use a Vec<N> instead of VecPerParamSpace<N>

rust-lang · Feb 22, 2015 · d523acb · d523acb
1 parent 4b09209
commit d523acb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/librustc/middle/traits/mod.rs b/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()
         }
     }
 }

diff --git a/src/librustc/middle/traits/select.rs b/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 {