Skip to content

Commit d523acb

Browse files
committed
Use a Vec<N> instead of VecPerParamSpace<N>
1 parent 4b09209 commit d523acb

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/librustc/middle/traits/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ pub struct VtableImplData<'tcx, N> {
265265
#[derive(Debug,Clone)]
266266
pub struct VtableDefaultTraitData<N> {
267267
pub trait_def_id: ast::DefId,
268-
pub nested: subst::VecPerParamSpace<N>
268+
pub nested: Vec<N>
269269
}
270270

271271
#[derive(Debug,Clone)]
@@ -594,7 +594,7 @@ impl<N> VtableDefaultTraitData<N> {
594594
{
595595
VtableDefaultTraitData {
596596
trait_def_id: self.trait_def_id,
597-
nested: self.nested.map(op)
597+
nested: self.nested.iter().map(op).collect()
598598
}
599599
}
600600

@@ -604,7 +604,7 @@ impl<N> VtableDefaultTraitData<N> {
604604
let VtableDefaultTraitData { trait_def_id, nested } = self;
605605
VtableDefaultTraitData {
606606
trait_def_id: trait_def_id,
607-
nested: nested.map_move(op)
607+
nested: nested.into_iter().map(op).collect()
608608
}
609609
}
610610
}

src/librustc/middle/traits/select.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
19181918
Err(ErrorReported) => Vec::new()
19191919
};
19201920

1921-
let obligations = VecPerParamSpace::new(obligations, Vec::new(), Vec::new());
19221921
debug!("vtable_default_impl_data: obligations={}", obligations.repr(self.tcx()));
19231922

19241923
VtableDefaultTraitData {

0 commit comments

Comments
 (0)