Skip to content

Commit e722f6f

Browse files
authored
Rollup merge of #114248 - fmease:neg-copy-rules-out-missing-copy-impl, r=b-naber
Make lint missing-copy-implementations honor negative `Copy` impls Fixes #101980. ``@rustbot`` label A-lint F-negative_impls
2 parents bedadff + 2b8a3b4 commit e722f6f

File tree

2 files changed

+38
-0
lines changed

2 files changed

+38
-0
lines changed

compiler/rustc_lint/src/builtin.rs

+23
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ use rustc_middle::lint::in_external_macro;
5858
use rustc_middle::ty::layout::LayoutOf;
5959
use rustc_middle::ty::print::with_no_trimmed_paths;
6060
use rustc_middle::ty::GenericArgKind;
61+
use rustc_middle::ty::ToPredicate;
6162
use rustc_middle::ty::TypeVisitableExt;
6263
use rustc_middle::ty::{self, Ty, TyCtxt, VariantDef};
6364
use rustc_session::config::ExpectedValues;
@@ -68,6 +69,7 @@ use rustc_span::symbol::{kw, sym, Ident, Symbol};
6869
use rustc_span::{BytePos, InnerSpan, Span};
6970
use rustc_target::abi::Abi;
7071
use rustc_trait_selection::infer::{InferCtxtExt, TyCtxtInferExt};
72+
use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt as _;
7173
use rustc_trait_selection::traits::{self, misc::type_allowed_to_implement_copy};
7274

7375
use crate::nonstandard_style::{method_context, MethodLateContext};
@@ -673,6 +675,9 @@ impl<'tcx> LateLintPass<'tcx> for MissingCopyImplementations {
673675
if ty.is_copy_modulo_regions(cx.tcx, param_env) {
674676
return;
675677
}
678+
if type_implements_negative_copy_modulo_regions(cx.tcx, ty, param_env) {
679+
return;
680+
}
676681

677682
// We shouldn't recommend implementing `Copy` on stateful things,
678683
// such as iterators.
@@ -708,6 +713,24 @@ impl<'tcx> LateLintPass<'tcx> for MissingCopyImplementations {
708713
}
709714
}
710715

716+
/// Check whether a `ty` has a negative `Copy` implementation, ignoring outlives constraints.
717+
fn type_implements_negative_copy_modulo_regions<'tcx>(
718+
tcx: TyCtxt<'tcx>,
719+
ty: Ty<'tcx>,
720+
param_env: ty::ParamEnv<'tcx>,
721+
) -> bool {
722+
let trait_ref = ty::TraitRef::new(tcx, tcx.require_lang_item(hir::LangItem::Copy, None), [ty]);
723+
let pred = ty::TraitPredicate { trait_ref, polarity: ty::ImplPolarity::Negative };
724+
let obligation = traits::Obligation {
725+
cause: traits::ObligationCause::dummy(),
726+
param_env,
727+
recursion_depth: 0,
728+
predicate: ty::Binder::dummy(pred).to_predicate(tcx),
729+
};
730+
731+
tcx.infer_ctxt().build().predicate_must_hold_modulo_regions(&obligation)
732+
}
733+
711734
declare_lint! {
712735
/// The `missing_debug_implementations` lint detects missing
713736
/// implementations of [`fmt::Debug`] for public types.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Regression test for issue #101980.
2+
// Ensure that we don't suggest impl'ing `Copy` for a type if it already impl's `!Copy`.
3+
4+
// check-pass
5+
6+
#![feature(negative_impls)]
7+
#![deny(missing_copy_implementations)]
8+
9+
pub struct Struct {
10+
pub field: i32,
11+
}
12+
13+
impl !Copy for Struct {}
14+
15+
fn main() {}

0 commit comments

Comments
 (0)