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

Show scrutinee expr type for struct fields.

Browse source 
TODO: The type is wrong and will be fixed in later commits.
This commit is contained in:
Mazdak Farrokhzad 2019-12-30 07:27:56 +01:00
parent ab050d6a83
commit 960acb044b
3 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_typeck/check/pat.rs
View file

@ -577,8 +577,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.demand_eqtype_pat(pat.span, expected, pat_ty, discrim_span);
// Type-check subpatterns.
if self.check_struct_pat_fields(pat_ty, pat.hir_id, pat.span, variant, fields, etc, def_bm)
{
if self.check_struct_pat_fields(
pat_ty,
pat.hir_id,
pat.span,
variant,
fields,
etc,
def_bm,
discrim_span,
) {
pat_ty
} else {
self.tcx.types.err
@ -859,6 +867,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
fields: &'tcx [hir::FieldPat<'tcx>],
etc: bool,
def_bm: BindingMode,
discrim_span: Option<Span>,
) -> bool {
let tcx = self.tcx;
@ -908,7 +917,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
};
self.check_pat(&field.pat, field_ty, def_bm, None);
self.check_pat(&field.pat, field_ty, def_bm, discrim_span);
}
let mut unmentioned_fields = variant