Add helper methods checking for "#[non_exhaustive] that's active"

A check for `#[non_exhaustive]` is often done in combination with
checking whether the type is local to the crate, in a variety of ways.
Create a helper method and standardize on it as the way to check for
this.
This commit is contained in:
Maja Kądziołka
2025-03-03 12:54:26 +01:00
parent e5c1d1cb7e
commit 10cf3cb945
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -134,7 +134,7 @@ fn check_block(&mut self, cx: &LateContext<'tcx>, block: &Block<'tcx>) {
&& let ty::Adt(adt, args) = *binding_type.kind()
&& adt.is_struct()
&& let variant = adt.non_enum_variant()
&& (adt.did().is_local() || !variant.is_field_list_non_exhaustive())
&& !variant.field_list_has_applicable_non_exhaustive()
&& let module_did = cx.tcx.parent_module(stmt.hir_id)
&& variant
.fields
+3 -2
View File
@@ -54,8 +54,9 @@ fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
if let ExprKind::Struct(_, fields, StructTailExpr::Base(base)) = expr.kind {
let ty = cx.typeck_results().expr_ty(expr);
if let ty::Adt(def, _) = ty.kind() {
if fields.len() == def.non_enum_variant().fields.len()
&& !def.variant(0_usize.into()).is_field_list_non_exhaustive()
let variant = def.non_enum_variant();
if fields.len() == variant.fields.len()
&& !variant.is_field_list_non_exhaustive()
{
span_lint(
cx,
+1 -1
View File
@@ -51,7 +51,7 @@ fn check_pat(&mut self, cx: &LateContext<'_>, pat: &Pat<'_>) {
let variant = cx.tcx.adt_def(enum_did).variant_with_id(did);
let has_only_fields_brackets = variant.ctor.is_some() && variant.fields.is_empty();
let non_exhaustive_activated = !variant.def_id.is_local() && variant.is_field_list_non_exhaustive();
let non_exhaustive_activated = variant.field_list_has_applicable_non_exhaustive();
if !has_only_fields_brackets || non_exhaustive_activated {
return;
}