nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build after rebase

Browse Source
This commit is contained in:
Andrew Cann 2016-12-01 12:41:21 +08:00
parent cfc45d52bb
commit d2827aa9bc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc_const_eval/pattern.rs
View File

@ -408,7 +408,7 @@ impl<'a, 'gcx, 'tcx> PatternContext<'a, 'gcx, 'tcx> {
pattern: self.lower_pattern(field), pattern: self.lower_pattern(field),
}) })
.collect(); .collect();
self.lower_variant_or_leaf(def, subpatterns) self.lower_variant_or_leaf(def, ty, subpatterns)
} }
PatKind::Struct(ref qpath, ref fields, _) => { PatKind::Struct(ref qpath, ref fields, _) => {
@ -441,7 +441,7 @@ impl<'a, 'gcx, 'tcx> PatternContext<'a, 'gcx, 'tcx> {
}) })
.collect(); .collect();
self.lower_variant_or_leaf(def, subpatterns) self.lower_variant_or_leaf(def, ty, subpatterns)
} }
}; };
@ -531,15 +531,15 @@ impl<'a, 'gcx, 'tcx> PatternContext<'a, 'gcx, 'tcx> {
fn lower_variant_or_leaf( fn lower_variant_or_leaf(
&mut self, &mut self,
def: Def, def: Def,
ty: Ty<'tcx>,
subpatterns: Vec<FieldPattern<'tcx>>) subpatterns: Vec<FieldPattern<'tcx>>)
-> PatternKind<'tcx> -> PatternKind<'tcx>
{ {
match def { match def {
Def::Variant(variant_id) | Def::VariantCtor(variant_id, ..) => { Def::Variant(variant_id) | Def::VariantCtor(variant_id, ..) => {
let ty = self.tcx.tables().node_id_to_type(pat.id);
let (adt_def, substs) = match ty.sty { let (adt_def, substs) = match ty.sty {
TypeVariants::TyAdt(adt_def, substs) => (adt_def, substs), TypeVariants::TyAdt(adt_def, substs) => (adt_def, substs),
_ => span_bug!(pat.span, "inappropriate type for def"), _ => bug!("inappropriate type for def"),
}; };
if adt_def.variants.len() > 1 { if adt_def.variants.len() > 1 {
PatternKind::Variant { PatternKind::Variant {
@ -584,7 +584,7 @@ impl<'a, 'gcx, 'tcx> PatternContext<'a, 'gcx, 'tcx> {
} }
} }
} }
_ => self.lower_variant_or_leaf(def, vec![]) _ => self.lower_variant_or_leaf(def, ty, vec![])
}; };
Pattern { Pattern {