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

Update for changes in rustc.

Browse source
This commit is contained in:
Scott Olson 2017-02-07 06:01:03 -08:00
parent b2b814177a
commit 9a7f76889a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/eval_context.rs
View file

@ -744,7 +744,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
Ok(adt_def.struct_variant().fields[field_index].ty(self.tcx, substs))
}
ty::TyTuple(fields) => Ok(fields[field_index]),
ty::TyTuple(fields, _) => Ok(fields[field_index]),
ty::TyRef(_, ref tam) |
ty::TyRawPtr(ref tam) => self.get_fat_field(tam.ty, field_index),

4
src/terminator/mod.rs
View file

@ -520,7 +520,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
if let Some((last, last_ty)) = args.pop() {
let last_layout = self.type_layout(last_ty)?;
match (&last_ty.sty, last_layout) {
(&ty::TyTuple(fields),
(&ty::TyTuple(fields, _),
&Layout::Univariant { ref variant, .. }) => {
let offsets = variant.offsets.iter().map(|s| s.bytes());
let last_ptr = match last {
@ -785,7 +785,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
drop,
)?;
},
ty::TyTuple(fields) => {
ty::TyTuple(fields, _) => {
let offsets = match *self.type_layout(ty)? {
Layout::Univariant { ref variant, .. } => &variant.offsets,
_ => bug!("tuples must be univariant"),