Do not emit E0277 on incorrect tuple destructured binding
This commit is contained in:
parent
7ee72070bd
commit
3d7099a968
4 changed files with 53 additions and 3 deletions
|
@ -299,10 +299,19 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
|
||||||
let element_tys = tcx.mk_type_list(element_tys_iter);
|
let element_tys = tcx.mk_type_list(element_tys_iter);
|
||||||
let pat_ty = tcx.mk_ty(ty::Tuple(element_tys));
|
let pat_ty = tcx.mk_ty(ty::Tuple(element_tys));
|
||||||
self.demand_eqtype(pat.span, expected, pat_ty);
|
self.demand_eqtype(pat.span, expected, pat_ty);
|
||||||
for (i, elem) in elements.iter().enumerate_and_adjust(max_len, ddpos) {
|
if self.has_errors.get() {
|
||||||
self.check_pat_walk(elem, &element_tys[i], def_bm, true);
|
let element_tys_iter = (0..max_len).map(|_| tcx.types.err);
|
||||||
|
let element_tys = tcx.mk_type_list(element_tys_iter);
|
||||||
|
for (_, elem) in elements.iter().enumerate_and_adjust(max_len, ddpos) {
|
||||||
|
self.check_pat_walk(elem, &tcx.types.err, def_bm, true);
|
||||||
|
}
|
||||||
|
tcx.mk_ty(ty::TyTuple(element_tys))
|
||||||
|
} else {
|
||||||
|
for (i, elem) in elements.iter().enumerate_and_adjust(max_len, ddpos) {
|
||||||
|
self.check_pat_walk(elem, &element_tys[i], def_bm, true);
|
||||||
|
}
|
||||||
|
pat_ty
|
||||||
}
|
}
|
||||||
pat_ty
|
|
||||||
}
|
}
|
||||||
PatKind::Box(ref inner) => {
|
PatKind::Box(ref inner) => {
|
||||||
let inner_ty = self.next_ty_var(TypeVariableOrigin::TypeInference(inner.span));
|
let inner_ty = self.next_ty_var(TypeVariableOrigin::TypeInference(inner.span));
|
||||||
|
|
|
@ -50,6 +50,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
|
||||||
|
|
||||||
pub fn demand_eqtype(&self, sp: Span, expected: Ty<'tcx>, actual: Ty<'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) {
|
if let Some(mut err) = self.demand_eqtype_diag(sp, expected, actual) {
|
||||||
|
self.has_errors.set(true);
|
||||||
err.emit();
|
err.emit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
28
src/test/ui/elide-errors-on-mismatched-tuple.rs
Normal file
28
src/test/ui/elide-errors-on-mismatched-tuple.rs
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
// Hide irrelevant E0277 errors (#50333)
|
||||||
|
|
||||||
|
trait T {}
|
||||||
|
|
||||||
|
struct A;
|
||||||
|
impl T for A {}
|
||||||
|
impl A {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let (a, b, c) = (A::new(), A::new()); // This tuple is 2 elements, should be three
|
||||||
|
//~^ ERROR mismatched types
|
||||||
|
let ts: Vec<&T> = vec![&a, &b, &c];
|
||||||
|
// There is no E0277 error above, as `a`, `b` and `c` are `TyErr`
|
||||||
|
}
|
12
src/test/ui/elide-errors-on-mismatched-tuple.stderr
Normal file
12
src/test/ui/elide-errors-on-mismatched-tuple.stderr
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
error[E0308]: mismatched types
|
||||||
|
--> $DIR/elide-errors-on-mismatched-tuple.rs:24:9
|
||||||
|
|
|
||||||
|
LL | let (a, b, c) = (A::new(), A::new()); // This tuple is 2 elements, should be three
|
||||||
|
| ^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
|
||||||
|
|
|
||||||
|
= note: expected type `(A, A)`
|
||||||
|
found type `(_, _, _)`
|
||||||
|
|
||||||
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0308`.
|
Loading…
Add table
Add a link
Reference in a new issue