bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

review comment

Browse source
This commit is contained in:
Esteban Küber 2019-09-04 23:59:04 -07:00
parent 21e7e3f1e9
commit 24d0a01b75
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -675,23 +675,39 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.tcx.check_stability(variant.fields[i].did, Some(pat.hir_id), subpat.span); self.tcx.check_stability(variant.fields[i].did, Some(pat.hir_id), subpat.span);
} }
} else { } else {
let subpats_ending = if subpats.len() == 1 { "" } else { "s" }; // Pattern has wrong number of fields.
let fields_ending = if variant.fields.len() == 1 { "" } else { "s" }; self.e0023(pat.span, res, &subpats, &variant.fields);
let span = tcx.def_span(res.def_id());
struct_span_err!(tcx.sess, pat.span, E0023,
"this pattern has {} field{}, but the corresponding {} has {} field{}",
subpats.len(), subpats_ending, res.descr(),
variant.fields.len(), fields_ending)
.span_label(pat.span, format!("expected {} field{}, found {}",
variant.fields.len(), fields_ending, subpats.len()))
.span_label(span, format!("{} defined here", res.descr()))
.emit();
on_error(); on_error();
return tcx.types.err; return tcx.types.err;
} }
pat_ty pat_ty
} }
fn e0023(&self, pat_span: Span, res: Res, subpats: &'tcx [P<Pat>], fields: &[ty::FieldDef]) {
let subpats_ending = if subpats.len() == 1 { "" } else { "s" };
let fields_ending = if fields.len() == 1 { "" } else { "s" };
let res_span = self.tcx.def_span(res.def_id());
struct_span_err!(
self.tcx.sess,
pat_span,
E0023,
"this pattern has {} field{}, but the corresponding {} has {} field{}",
subpats.len(),
subpats_ending,
res.descr(),
fields.len(),
fields_ending,
)
.span_label(pat_span, format!(
"expected {} field{}, found {}",
fields.len(),
fields_ending,
subpats.len(),
))
.span_label(res_span, format!("{} defined here", res.descr()))
.emit();
}
fn check_pat_tuple( fn check_pat_tuple(
&self, &self,
span: Span, span: Span,