user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Flavio Percoco 2015-02-04 11:51:17 +01:00
parent 4b09209efe
commit d523acb495
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc/middle/traits/mod.rs
View file

@ -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()
}
}
}

1
src/librustc/middle/traits/select.rs
View file

@ -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 {