Skip to content

Commit edddcb8

Browse files
NadrierilNadrieril
committed
Skip most of check_match checks in the presence of PatKind::Error 
1 parent 5eca57c commit edddcb8

File tree

4 files changed

+29
-54
lines changed

4 files changed

+29
-54
lines changed

‎compiler/rustc_mir_build/src/thir/pattern/check_match.rs‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,10 @@ impl<'p, 'tcx> MatchVisitor<'_, 'p, 'tcx> {
231231
if let LetSource::None = source {
232232
return;
233233
}
234+
if let Err(err) = pat.pat_error_reported() {
235+
self.error = Err(err);
236+
return;
237+
}
234238
self.check_patterns(pat, Refutable);
235239
let mut cx = self.new_cx(self.lint_level, true);
236240
let tpat = self.lower_pattern(&mut cx, pat);
@@ -252,6 +256,10 @@ impl<'p, 'tcx> MatchVisitor<'_, 'p, 'tcx> {
252256
self.with_lint_level(arm.lint_level, |this| {
253257
this.check_patterns(&arm.pattern, Refutable);
254258
});
259+
if let Err(err) = arm.pattern.pat_error_reported() {
260+
self.error = Err(err);
261+
return;
262+
}
255263
}
256264

257265
let tarms: Vec<_> = arms
@@ -334,7 +342,8 @@ impl<'p, 'tcx> MatchVisitor<'_, 'p, 'tcx> {
334342
// and record chain members that aren't let exprs.
335343
let mut chain_refutabilities = Vec::new();
336344

337-
let add = |expr: ExprId, mut local_lint_level| {
345+
let mut error = Ok(());
346+
let mut add = |expr: ExprId, mut local_lint_level| {
338347
// `local_lint_level` is the lint level enclosing the pattern inside `expr`.
339348
let mut expr = &self.thir[expr];
340349
debug!(?expr, ?local_lint_level, "add");
@@ -348,6 +357,10 @@ impl<'p, 'tcx> MatchVisitor<'_, 'p, 'tcx> {
348357
debug!(?expr, ?local_lint_level, "after scopes");
349358
match expr.kind {
350359
ExprKind::Let { box ref pat, expr: _ } => {
360+
if let Err(err) = pat.pat_error_reported() {
361+
error = Err(err);
362+
return None;
363+
}
351364
let mut ncx = self.new_cx(local_lint_level, true);
352365
let tpat = self.lower_pattern(&mut ncx, pat);
353366
let refutable = !is_let_irrefutable(&mut ncx, local_lint_level, tpat);
@@ -380,6 +393,11 @@ impl<'p, 'tcx> MatchVisitor<'_, 'p, 'tcx> {
380393
debug!(?chain_refutabilities);
381394
chain_refutabilities.reverse();
382395

396+
if error.is_err() {
397+
self.error = error;
398+
return;
399+
}
400+
383401
// Third, emit the actual warnings.
384402
if chain_refutabilities.iter().all(|r| matches!(*r, Some((_, false)))) {
385403
// The entire chain is made up of irrefutable `let` statements
@@ -688,12 +706,6 @@ fn non_exhaustive_match<'p, 'tcx>(
688706
arms: &[ArmId],
689707
expr_span: Span,
690708
) -> ErrorGuaranteed {
691-
for &arm in arms {
692-
if let Err(err) = thir[arm].pattern.pat_error_reported() {
693-
return err;
694-
}
695-
}
696-
697709
let is_empty_match = arms.is_empty();
698710
let non_empty_enum = match scrut_ty.kind() {
699711
ty::Adt(def, _) => def.is_enum() && !def.variants().is_empty(),

‎tests/ui/const-generics/generic_const_exprs/typeid-equality-by-subtyping.stderr‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,5 @@ LL | WHAT_A_TYPE => 0,
77
= note: the traits must be derived, manual `impl`s are not sufficient
88
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
99

10-
error[E0015]: cannot match on `TypeId` in constant functions
11-
--> $DIR/typeid-equality-by-subtyping.rs:18:9
12-
|
13-
LL | WHAT_A_TYPE => 0,
14-
| ^^^^^^^^^^^
15-
|
16-
= note: `TypeId` cannot be compared in compile-time, and therefore cannot be used in `match`es
17-
note: impl defined here, but it is not `const`
18-
--> $SRC_DIR/core/src/any.rs:LL:COL
19-
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
20-
21-
error: aborting due to 2 previous errors
10+
error: aborting due to previous error
2211

23-
For more information about this error, try `rustc --explain E0015`.

‎tests/ui/pattern/usefulness/consts-opaque.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,13 @@ fn main() {
5252
BAR => {}
5353
//~^ ERROR must be annotated with `#[derive(PartialEq, Eq)]`
5454
_ => {}
55-
//~^ ERROR unreachable pattern
5655
}
5756

5857
match BAR {
5958
BAR => {}
6059
//~^ ERROR must be annotated with `#[derive(PartialEq, Eq)]`
6160
Bar => {}
6261
_ => {}
63-
//~^ ERROR unreachable pattern
6462
}
6563

6664
match BAR {

‎tests/ui/pattern/usefulness/consts-opaque.stderr‎

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ LL | BAR => {}
3838
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
3939

4040
error: to use a constant of type `Bar` in a pattern, `Bar` must be annotated with `#[derive(PartialEq, Eq)]`
41-
--> $DIR/consts-opaque.rs:59:9
41+
--> $DIR/consts-opaque.rs:58:9
4242
|
4343
LL | BAR => {}
4444
| ^^^
@@ -47,7 +47,7 @@ LL | BAR => {}
4747
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
4848

4949
error: to use a constant of type `Bar` in a pattern, `Bar` must be annotated with `#[derive(PartialEq, Eq)]`
50-
--> $DIR/consts-opaque.rs:67:9
50+
--> $DIR/consts-opaque.rs:65:9
5151
|
5252
LL | BAR => {}
5353
| ^^^
@@ -56,7 +56,7 @@ LL | BAR => {}
5656
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
5757

5858
error: to use a constant of type `Bar` in a pattern, `Bar` must be annotated with `#[derive(PartialEq, Eq)]`
59-
--> $DIR/consts-opaque.rs:69:9
59+
--> $DIR/consts-opaque.rs:67:9
6060
|
6161
LL | BAR => {}
6262
| ^^^
@@ -65,7 +65,7 @@ LL | BAR => {}
6565
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
6666

6767
error: to use a constant of type `Baz` in a pattern, `Baz` must be annotated with `#[derive(PartialEq, Eq)]`
68-
--> $DIR/consts-opaque.rs:75:9
68+
--> $DIR/consts-opaque.rs:73:9
6969
|
7070
LL | BAZ => {}
7171
| ^^^
@@ -74,7 +74,7 @@ LL | BAZ => {}
7474
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
7575

7676
error: to use a constant of type `Baz` in a pattern, `Baz` must be annotated with `#[derive(PartialEq, Eq)]`
77-
--> $DIR/consts-opaque.rs:83:9
77+
--> $DIR/consts-opaque.rs:81:9
7878
|
7979
LL | BAZ => {}
8080
| ^^^
@@ -83,45 +83,22 @@ LL | BAZ => {}
8383
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
8484

8585
error: to use a constant of type `Baz` in a pattern, `Baz` must be annotated with `#[derive(PartialEq, Eq)]`
86-
--> $DIR/consts-opaque.rs:89:9
86+
--> $DIR/consts-opaque.rs:87:9
8787
|
8888
LL | BAZ => {}
8989
| ^^^
9090
|
9191
= note: the traits must be derived, manual `impl`s are not sufficient
9292
= note: see https://doc.rust-lang.org/stable/std/marker/trait.StructuralEq.html for details
9393

94-
error: unreachable pattern
95-
--> $DIR/consts-opaque.rs:54:9
96-
|
97-
LL | Bar => {}
98-
| --- matches any value
99-
...
100-
LL | _ => {}
101-
| ^ unreachable pattern
102-
|
103-
note: the lint level is defined here
104-
--> $DIR/consts-opaque.rs:6:9
105-
|
106-
LL | #![deny(unreachable_patterns)]
107-
| ^^^^^^^^^^^^^^^^^^^^
108-
109-
error: unreachable pattern
110-
--> $DIR/consts-opaque.rs:62:9
111-
|
112-
LL | Bar => {}
113-
| --- matches any value
114-
LL | _ => {}
115-
| ^ unreachable pattern
116-
11794
error[E0004]: non-exhaustive patterns: `Wrap(_)` not covered
118-
--> $DIR/consts-opaque.rs:124:11
95+
--> $DIR/consts-opaque.rs:122:11
11996
|
12097
LL | match WRAPQUUX {
12198
| ^^^^^^^^ pattern `Wrap(_)` not covered
12299
|
123100
note: `Wrap<fn(usize, usize) -> usize>` defined here
124-
--> $DIR/consts-opaque.rs:106:12
101+
--> $DIR/consts-opaque.rs:104:12
125102
|
126103
LL | struct Wrap<T>(T);
127104
| ^^^^
@@ -132,6 +109,6 @@ LL ~ WRAPQUUX => {},
132109
LL + Wrap(_) => todo!()
133110
|
134111

135-
error: aborting due to 12 previous errors; 1 warning emitted
112+
error: aborting due to 10 previous errors; 1 warning emitted
136113

137114
For more information about this error, try `rustc --explain E0004`.

0 commit comments

Comments
 (0)