bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #120775 - Nadrieril:more-min_exh_pats, r=compiler-errors

Browse source 
Make `min_exhaustive_patterns` match `exhaustive_patterns` better

Split off from https://github.com/rust-lang/rust/pull/120742.

There remained two edge cases where `min_exhaustive_patterns` wasn't behaving like `exhaustive_patterns`. This fixes them, and tests the feature in a bunch more cases. I essentially went through all uses of `exhaustive_patterns` to see which ones would be interesting to compare between the two features.

r? `@compiler-errors`
This commit is contained in:
Matthias Krüger 2024-02-08 20:34:59 +01:00 • committed by GitHub
commit 949e55299d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 192 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_mir_build/src/build/matches/simplify.rs
View file

@ -270,7 +270,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
PatKind::Variant { adt_def, args, variant_index, ref subpatterns } => {
let irrefutable = adt_def.variants().iter_enumerated().all(|(i, v)| {
i == variant_index || {
self.tcx.features().exhaustive_patterns
(self.tcx.features().exhaustive_patterns
|| self.tcx.features().min_exhaustive_patterns)
&& !v
.inhabited_predicate(self.tcx, adt_def)
.instantiate(self.tcx, args)

3
compiler/rustc_mir_build/src/thir/pattern/check_match.rs
View file

@ -665,7 +665,8 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
// Emit an extra note if the first uncovered witness would be uninhabited
// if we disregard visibility.
let witness_1_is_privately_uninhabited = if self.tcx.features().exhaustive_patterns
let witness_1_is_privately_uninhabited = if (self.tcx.features().exhaustive_patterns
|| self.tcx.features().min_exhaustive_patterns)
&& let Some(witness_1) = witnesses.get(0)
&& let ty::Adt(adt, args) = witness_1.ty().kind()
&& adt.is_enum()