mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-28 11:07:42 +00:00
Accept TyError
in patterns to avoid ICE on bad input
This commit is contained in:
parent
6ec1b626ba
commit
fe5710a25e
@ -505,7 +505,16 @@ impl<'a, 'tcx> PatternContext<'a, 'tcx> {
|
|||||||
let def = self.tables.qpath_def(qpath, pat.hir_id);
|
let def = self.tables.qpath_def(qpath, pat.hir_id);
|
||||||
let adt_def = match ty.sty {
|
let adt_def = match ty.sty {
|
||||||
ty::TyAdt(adt_def, _) => adt_def,
|
ty::TyAdt(adt_def, _) => adt_def,
|
||||||
_ => span_bug!(pat.span, "tuple struct pattern not applied to an ADT"),
|
ty::TyError => { // Avoid ICE (#50585)
|
||||||
|
return Pattern {
|
||||||
|
span: pat.span,
|
||||||
|
ty,
|
||||||
|
kind: Box::new(PatternKind::Wild),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
_ => span_bug!(pat.span,
|
||||||
|
"tuple struct pattern not applied to an ADT {:?}",
|
||||||
|
ty.sty),
|
||||||
};
|
};
|
||||||
let variant_def = adt_def.variant_of_def(def);
|
let variant_def = adt_def.variant_of_def(def);
|
||||||
|
|
||||||
@ -637,6 +646,9 @@ impl<'a, 'tcx> PatternContext<'a, 'tcx> {
|
|||||||
let substs = match ty.sty {
|
let substs = match ty.sty {
|
||||||
ty::TyAdt(_, substs) |
|
ty::TyAdt(_, substs) |
|
||||||
ty::TyFnDef(_, substs) => substs,
|
ty::TyFnDef(_, substs) => substs,
|
||||||
|
ty::TyError => { // Avoid ICE (#50585)
|
||||||
|
return PatternKind::Wild;
|
||||||
|
}
|
||||||
_ => bug!("inappropriate type for def: {:?}", ty.sty),
|
_ => bug!("inappropriate type for def: {:?}", ty.sty),
|
||||||
};
|
};
|
||||||
PatternKind::Variant {
|
PatternKind::Variant {
|
||||||
|
14
src/test/ui/issue-50585.rs
Normal file
14
src/test/ui/issue-50585.rs
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
|y: Vec<[(); for x in 0..2 {}]>| {};
|
||||||
|
//~^ ERROR mismatched types
|
||||||
|
}
|
14
src/test/ui/issue-50585.stderr
Normal file
14
src/test/ui/issue-50585.stderr
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
error[E0308]: mismatched types
|
||||||
|
--> $DIR/issue-50585.rs:12:18
|
||||||
|
|
|
||||||
|
LL | fn main() {
|
||||||
|
| - expected `()` because of default return type
|
||||||
|
LL | |y: Vec<[(); for x in 0..2 {}]>| {};
|
||||||
|
| ^^^^^^^^^^^^^^^^ expected usize, found ()
|
||||||
|
|
|
||||||
|
= note: expected type `usize`
|
||||||
|
found type `()`
|
||||||
|
|
||||||
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0308`.
|
Loading…
Reference in New Issue
Block a user