Drop clippy::vtable_address_comparisons

rust-lang · Nov 9, 2023 · 2627283 · 2627283
1 parent 1d215b1
commit 2627283
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 247 deletions.
diff --git a/src/tools/clippy/clippy_lints/src/declared_lints.rs b/src/tools/clippy/clippy_lints/src/declared_lints.rs
@@ -681,7 681,6 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
  crate::unit_types::UNIT_ARG_INFO,
  crate::unit_types::UNIT_CMP_INFO,
  crate::unnamed_address::FN_ADDRESS_COMPARISONS_INFO,
- crate::unnamed_address::VTABLE_ADDRESS_COMPARISONS_INFO,
  crate::unnecessary_box_returns::UNNECESSARY_BOX_RETURNS_INFO,
  crate::unnecessary_map_on_constructor::UNNECESSARY_MAP_ON_CONSTRUCTOR_INFO,
  crate::unnecessary_owned_empty_strings::UNNECESSARY_OWNED_EMPTY_STRINGS_INFO,

diff --git a/src/tools/clippy/clippy_lints/src/renamed_lints.rs b/src/tools/clippy/clippy_lints/src/renamed_lints.rs
@@ -58,4 58,5 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
  ("clippy::undropped_manually_drops", "undropped_manually_drops"),
  ("clippy::unknown_clippy_lints", "unknown_lints"),
  ("clippy::unused_label", "unused_labels"),
  ("clippy::vtable_address_comparisons", "invalid_pointer_trait_comparisons"),
 ];
diff --git a/src/tools/clippy/clippy_lints/src/unnamed_address.rs b/src/tools/clippy/clippy_lints/src/unnamed_address.rs
@@ -1,10 1,9 @@
-use clippy_utils::diagnostics::{span_lint, span_lint_and_help};
 use clippy_utils::diagnostics::span_lint;
 use if_chain::if_chain;
 use rustc_hir::{BinOpKind, Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty;
 use rustc_session::{declare_lint_pass, declare_tool_lint};
-use rustc_span::sym;
 
 declare_clippy_lint! {
  /// ### What it does
@@ -30,31 29,7 @@ declare_clippy_lint! {
  "comparison with an address of a function item"
 }
 
-declare_clippy_lint! {
- /// ### What it does
- /// Checks for comparisons with an address of a trait vtable.
- ///
- /// ### Why is this bad?
- /// Comparing trait objects pointers compares an vtable addresses which
- /// are not guaranteed to be unique and could vary between different code generation units.
- /// Furthermore vtables for different types could have the same address after being merged
- /// together.
- ///
- /// ### Example
- /// ```rust,ignore
- /// let a: Rc<dyn Trait> = ...
- /// let b: Rc<dyn Trait> = ...
- /// if Rc::ptr_eq(&a, &b) {
- /// ...
- /// }
- /// ```
- #[clippy::version = "1.44.0"]
- pub VTABLE_ADDRESS_COMPARISONS,
- correctness,
- "comparison with an address of a trait vtable"
-}
-
-declare_lint_pass!(UnnamedAddress => [FN_ADDRESS_COMPARISONS, VTABLE_ADDRESS_COMPARISONS]);
 declare_lint_pass!(UnnamedAddress => [FN_ADDRESS_COMPARISONS]);
 
 impl LateLintPass<'_> for UnnamedAddress {
  fn check_expr(&mut self, cx: &LateContext<'_>, expr: &Expr<'_>) {
@@ -65,52 40,10 @@ impl LateLintPass<'_> for UnnamedAddress {
  )
  }
 
- fn is_trait_ptr(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
- match cx.typeck_results().expr_ty_adjusted(expr).kind() {
- ty::RawPtr(ty::TypeAndMut { ty, .. }) => ty.is_trait(),
- _ => false,
- }
- }
-
  fn is_fn_def(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
  matches!(cx.typeck_results().expr_ty(expr).kind(), ty::FnDef(..))
  }
 
- if_chain! {
- if let ExprKind::Binary(binop, left, right) = expr.kind;
- if is_comparison(binop.node);
- if is_trait_ptr(cx, left) && is_trait_ptr(cx, right);
- then {
- span_lint_and_help(
- cx,
- VTABLE_ADDRESS_COMPARISONS,
- expr.span,
- "comparing trait object pointers compares a non-unique vtable address",
- None,
- "consider extracting and comparing data pointers only",
- );
- }
- }
-
- if_chain! {
- if let ExprKind::Call(func, [ref _left, ref _right]) = expr.kind;
- if let ExprKind::Path(ref func_qpath) = func.kind;
- if let Some(def_id) = cx.qpath_res(func_qpath, func.hir_id).opt_def_id();
- if cx.tcx.is_diagnostic_item(sym::ptr_eq, def_id);
- let ty_param = cx.typeck_results().node_args(func.hir_id).type_at(0);
- if ty_param.is_trait();
- then {
- span_lint_and_help(
- cx,
- VTABLE_ADDRESS_COMPARISONS,
- expr.span,
- "comparing trait object pointers compares a non-unique vtable address",
- None,
- "consider extracting and comparing data pointers only",
- );
- }
- }
-
  if_chain! {
  if let ExprKind::Binary(binop, left, right) = expr.kind;
  if is_comparison(binop.node);

diff --git a/src/tools/clippy/tests/ui/rename.fixed b/src/tools/clippy/tests/ui/rename.fixed
@@ -51,6 51,7 @@
 #![allow(undropped_manually_drops)]
 #![allow(unknown_lints)]
 #![allow(unused_labels)]
 #![allow(invalid_pointer_trait_comparisons)]
 #![warn(clippy::almost_complete_range)]
 #![warn(clippy::disallowed_names)]
 #![warn(clippy::blocks_in_if_conditions)]
@@ -107,5 108,6 @@
 #![warn(undropped_manually_drops)]
 #![warn(unknown_lints)]
 #![warn(unused_labels)]
 #![warn(invalid_pointer_trait_comparisons)]
 
 fn main() {}
diff --git a/src/tools/clippy/tests/ui/rename.rs b/src/tools/clippy/tests/ui/rename.rs
@@ -51,6 51,7 @@
 #![allow(undropped_manually_drops)]
 #![allow(unknown_lints)]
 #![allow(unused_labels)]
 #![allow(invalid_pointer_trait_comparisons)]
 #![warn(clippy::almost_complete_letter_range)]
 #![warn(clippy::blacklisted_name)]
 #![warn(clippy::block_in_if_condition_expr)]
@@ -107,5 108,6 @@
 #![warn(clippy::undropped_manually_drops)]
 #![warn(clippy::unknown_clippy_lints)]
 #![warn(clippy::unused_label)]
 #![warn(clippy::vtable_address_comparisons)]
 
 fn main() {}