bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove all matching on ty.kind() outside cx

Browse source
This commit is contained in:
Nadrieril 2023-12-11 11:11:12 +01:00
parent b111b2e839
commit 081c3dcf43
4 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_pattern_analysis/src/usefulness.rs
View file

@ -556,7 +556,7 @@ use smallvec::{smallvec, SmallVec};
use std::fmt;
use rustc_data_structures::{captures::Captures, stack::ensure_sufficient_stack};
use rustc_middle::ty::{self, Ty};
use rustc_middle::ty::Ty;
use rustc_span::{Span, DUMMY_SP};
use crate::constructor::{Constructor, ConstructorSet};
@ -856,11 +856,10 @@ impl<'p, 'tcx> Matrix<'p, 'tcx> {
let mut ty = self.wildcard_row.head().ty();
// If the type is opaque and it is revealed anywhere in the column, we take the revealed
// version. Otherwise we could encounter constructors for the revealed type and crash.
let is_opaque = |ty: Ty<'tcx>| matches!(ty.kind(), ty::Alias(ty::Opaque, ..));
if is_opaque(ty) {
if MatchCheckCtxt::is_opaque(ty) {
for pat in self.heads() {
let pat_ty = pat.ty();
if !is_opaque(pat_ty) {
if !MatchCheckCtxt::is_opaque(pat_ty) {
ty = pat_ty;
break;
}