bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

address review comment, reduce scope

Browse source
This commit is contained in:
Esteban Küber 2018-09-11 17:06:11 -07:00
parent 633a47becb
commit 5f8bf91e96
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_typeck/check/_match.rs
View file

@ -298,8 +298,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
TypeVariableOrigin::TypeInference(pat.span)));
let element_tys = tcx.mk_type_list(element_tys_iter);
let pat_ty = tcx.mk_ty(ty::Tuple(element_tys));
self.demand_eqtype(pat.span, expected, pat_ty);
if self.has_errors.get() {
if let Some(mut err) = self.demand_eqtype_diag(pat.span, expected, pat_ty) {
err.emit();
let element_tys_iter = (0..max_len).map(|_| tcx.types.err);
for (_, elem) in elements.iter().enumerate_and_adjust(max_len, ddpos) {
self.check_pat_walk(elem, &tcx.types.err, def_bm, true);

1
src/librustc_typeck/check/demand.rs
View file

@ -50,7 +50,6 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
pub fn demand_eqtype(&self, sp: Span, expected: Ty<'tcx>, actual: Ty<'tcx>) {
if let Some(mut err) = self.demand_eqtype_diag(sp, expected, actual) {
self.has_errors.set(true);
err.emit();
}
}