inline non_exhaustive def/variant check

rust-lang · Oct 17, 2023 · 45dd973 · 45dd973
1 parent 7684b8b
commit 45dd973
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
@@ -677,7 +677,9 @@ impl<'tcx> LateLintPass<'tcx> for MissingCopyImplementations {
  if type_implements_negative_copy_modulo_regions(cx.tcx, ty, param_env) {
  return;
  }
- if def_or_variant_marked_non_exhaustive(def) {
+ if def.is_variant_list_non_exhaustive()
+ || def.variants().iter().any(|variant| variant.is_field_list_non_exhaustive())
+ {
  return;
  }
 
@@ -733,11 +735,6 @@ fn type_implements_negative_copy_modulo_regions<'tcx>(
  tcx.infer_ctxt().build().predicate_must_hold_modulo_regions(&obligation)
 }
 
-fn def_or_variant_marked_non_exhaustive<'tcx>(def: ty::AdtDef<'tcx>) -> bool {
- def.is_variant_list_non_exhaustive()
- || def.variants().iter().any(|variant| variant.is_field_list_non_exhaustive())
-}
-
 declare_lint! {
  /// The `missing_debug_implementations` lint detects missing
  /// implementations of [`fmt::Debug`] for public types.