Consider fields to be inhabited if they are unstable
This commit is contained in:
parent
75530e9f72
commit
f6107ca173
6 changed files with 95 additions and 1 deletions
|
@ -84,6 +84,15 @@ impl<'tcx> VariantDef {
|
||||||
InhabitedPredicate::all(
|
InhabitedPredicate::all(
|
||||||
tcx,
|
tcx,
|
||||||
self.fields.iter().map(|field| {
|
self.fields.iter().map(|field| {
|
||||||
|
// Unstable fields are always considered to be inhabited. In the future,
|
||||||
|
// this could be extended to be conditional on the field being unstable
|
||||||
|
// only within the module that's querying the inhabitedness, like:
|
||||||
|
// `let pred = pred.or(InhabitedPredicate::IsUnstable(field.did));`
|
||||||
|
// but this is unnecessary for now, since it would only affect nightly-only
|
||||||
|
// code or code within the standard library itself.
|
||||||
|
if tcx.lookup_stability(field.did).is_some_and(|stab| stab.is_unstable()) {
|
||||||
|
return InhabitedPredicate::True;
|
||||||
|
}
|
||||||
let pred = tcx.type_of(field.did).instantiate_identity().inhabited_predicate(tcx);
|
let pred = tcx.type_of(field.did).instantiate_identity().inhabited_predicate(tcx);
|
||||||
if adt.is_enum() {
|
if adt.is_enum() {
|
||||||
return pred;
|
return pred;
|
||||||
|
|
|
@ -232,7 +232,11 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
|
||||||
let is_visible =
|
let is_visible =
|
||||||
adt.is_enum() || field.vis.is_accessible_from(cx.module, cx.tcx);
|
adt.is_enum() || field.vis.is_accessible_from(cx.module, cx.tcx);
|
||||||
let is_uninhabited = cx.is_uninhabited(*ty);
|
let is_uninhabited = cx.is_uninhabited(*ty);
|
||||||
let skip = is_uninhabited && !is_visible;
|
let is_unstable = cx
|
||||||
|
.tcx
|
||||||
|
.lookup_stability(field.did)
|
||||||
|
.is_some_and(|stab| stab.is_unstable());
|
||||||
|
let skip = is_uninhabited && (!is_visible || is_unstable);
|
||||||
(ty, PrivateUninhabitedField(skip))
|
(ty, PrivateUninhabitedField(skip))
|
||||||
});
|
});
|
||||||
cx.dropless_arena.alloc_from_iter(tys)
|
cx.dropless_arena.alloc_from_iter(tys)
|
||||||
|
|
8
tests/ui/uninhabited/auxiliary/staged-api.rs
Normal file
8
tests/ui/uninhabited/auxiliary/staged-api.rs
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
#![feature(staged_api)]
|
||||||
|
#![stable(feature = "stable", since = "1.0.0")]
|
||||||
|
|
||||||
|
#[stable(feature = "stable", since = "1.0.0")]
|
||||||
|
pub struct Foo<T> {
|
||||||
|
#[unstable(feature = "unstable", issue = "none")]
|
||||||
|
pub field: T,
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
error[E0004]: non-exhaustive patterns: type `Foo<Void>` is non-empty
|
||||||
|
--> $DIR/uninhabited-unstable-field.rs:13:11
|
||||||
|
|
|
||||||
|
LL | match x {}
|
||||||
|
| ^
|
||||||
|
|
|
||||||
|
note: `Foo<Void>` defined here
|
||||||
|
--> $DIR/auxiliary/staged-api.rs:5:1
|
||||||
|
|
|
||||||
|
LL | pub struct Foo<T> {
|
||||||
|
| ^^^^^^^^^^^^^^^^^
|
||||||
|
= note: the matched value is of type `Foo<Void>`
|
||||||
|
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern as shown
|
||||||
|
|
|
||||||
|
LL ~ match x {
|
||||||
|
LL + _ => todo!(),
|
||||||
|
LL + }
|
||||||
|
|
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0004`.
|
|
@ -0,0 +1,22 @@
|
||||||
|
error[E0004]: non-exhaustive patterns: type `Foo<Void>` is non-empty
|
||||||
|
--> $DIR/uninhabited-unstable-field.rs:13:11
|
||||||
|
|
|
||||||
|
LL | match x {}
|
||||||
|
| ^
|
||||||
|
|
|
||||||
|
note: `Foo<Void>` defined here
|
||||||
|
--> $DIR/auxiliary/staged-api.rs:5:1
|
||||||
|
|
|
||||||
|
LL | pub struct Foo<T> {
|
||||||
|
| ^^^^^^^^^^^^^^^^^
|
||||||
|
= note: the matched value is of type `Foo<Void>`
|
||||||
|
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern as shown
|
||||||
|
|
|
||||||
|
LL ~ match x {
|
||||||
|
LL + _ => todo!(),
|
||||||
|
LL ~ }
|
||||||
|
|
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0004`.
|
29
tests/ui/uninhabited/uninhabited-unstable-field.rs
Normal file
29
tests/ui/uninhabited/uninhabited-unstable-field.rs
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
//@ aux-build: staged-api.rs
|
||||||
|
//@ revisions: current exhaustive
|
||||||
|
|
||||||
|
#![feature(exhaustive_patterns)]
|
||||||
|
|
||||||
|
extern crate staged_api;
|
||||||
|
|
||||||
|
use staged_api::Foo;
|
||||||
|
|
||||||
|
enum Void {}
|
||||||
|
|
||||||
|
fn demo(x: Foo<Void>) {
|
||||||
|
match x {}
|
||||||
|
//~^ ERROR non-exhaustive patterns
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure that the pattern is not considered unreachable.
|
||||||
|
fn demo2(x: Foo<Void>) {
|
||||||
|
match x {
|
||||||
|
Foo { .. } => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Same as above, but for wildcard.
|
||||||
|
fn demo3(x: Foo<Void>) {
|
||||||
|
match x { _ => {} }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
Loading…
Add table
Add a link
Reference in a new issue