Skip to content

Commit add7d8c

Browse files
committed
Drop uplifted clippy::fn_address_comparisons
1 parent b7b84e3 commit add7d8c

9 files changed

+79
-170
lines changed

src/tools/clippy/clippy_lints/src/declared_lints.rs

-1
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,6 @@ pub static LINTS: &[&crate::LintInfo] = &[
736736
crate::unit_types::LET_UNIT_VALUE_INFO,
737737
crate::unit_types::UNIT_ARG_INFO,
738738
crate::unit_types::UNIT_CMP_INFO,
739-
crate::unnamed_address::FN_ADDRESS_COMPARISONS_INFO,
740739
crate::unnecessary_box_returns::UNNECESSARY_BOX_RETURNS_INFO,
741740
crate::unnecessary_literal_bound::UNNECESSARY_LITERAL_BOUND_INFO,
742741
crate::unnecessary_map_on_constructor::UNNECESSARY_MAP_ON_CONSTRUCTOR_INFO,

src/tools/clippy/clippy_lints/src/deprecated_lints.rs

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ declare_with_version! { RENAMED(RENAMED_VERSION): &[(&str, &str)] = &[
7474
#[clippy::version = "1.53.0"]
7575
("clippy::filter_map", "clippy::manual_filter_map"),
7676
#[clippy::version = ""]
77+
("clippy::fn_address_comparisons", "unpredictable_function_pointer_comparisons"),
78+
#[clippy::version = ""]
7779
("clippy::identity_conversion", "clippy::useless_conversion"),
7880
#[clippy::version = "pre 1.29.0"]
7981
("clippy::if_let_redundant_pattern_matching", "clippy::redundant_pattern_matching"),

src/tools/clippy/clippy_lints/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ mod uninhabited_references;
362362
mod uninit_vec;
363363
mod unit_return_expecting_ord;
364364
mod unit_types;
365-
mod unnamed_address;
366365
mod unnecessary_box_returns;
367366
mod unnecessary_literal_bound;
368367
mod unnecessary_map_on_constructor;
@@ -776,7 +775,6 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
776775
store.register_early_pass(|| Box::new(option_env_unwrap::OptionEnvUnwrap));
777776
store.register_late_pass(move |_| Box::new(wildcard_imports::WildcardImports::new(conf)));
778777
store.register_late_pass(|_| Box::<redundant_pub_crate::RedundantPubCrate>::default());
779-
store.register_late_pass(|_| Box::new(unnamed_address::UnnamedAddress));
780778
store.register_late_pass(|_| Box::<dereference::Dereferencing<'_>>::default());
781779
store.register_late_pass(|_| Box::new(option_if_let_else::OptionIfLetElse));
782780
store.register_late_pass(|_| Box::new(future_not_send::FutureNotSend));

src/tools/clippy/clippy_lints/src/unnamed_address.rs

-60
This file was deleted.

src/tools/clippy/tests/ui/fn_address_comparisons.rs

-23
This file was deleted.

src/tools/clippy/tests/ui/fn_address_comparisons.stderr

-17
This file was deleted.

src/tools/clippy/tests/ui/rename.fixed

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#![allow(unknown_lints)]
6060
#![allow(unused_labels)]
6161
#![allow(ambiguous_wide_pointer_comparisons)]
62+
#![allow(unpredictable_function_pointer_comparisons)]
6263
#![allow(clippy::reversed_empty_ranges)]
6364
#![warn(clippy::almost_complete_range)] //~ ERROR: lint `clippy::almost_complete_letter_range`
6465
#![warn(clippy::disallowed_names)] //~ ERROR: lint `clippy::blacklisted_name`
@@ -74,6 +75,7 @@
7475
#![warn(clippy::mixed_read_write_in_expression)] //~ ERROR: lint `clippy::eval_order_dependence`
7576
#![warn(clippy::manual_find_map)] //~ ERROR: lint `clippy::find_map`
7677
#![warn(clippy::manual_filter_map)] //~ ERROR: lint `clippy::filter_map`
78+
#![warn(unpredictable_function_pointer_comparisons)] //~ ERROR: lint `clippy::fn_address_comparisons`
7779
#![warn(clippy::useless_conversion)] //~ ERROR: lint `clippy::identity_conversion`
7880
#![warn(clippy::redundant_pattern_matching)] //~ ERROR: lint `clippy::if_let_redundant_pattern_matching`
7981
#![warn(clippy::match_result_ok)] //~ ERROR: lint `clippy::if_let_some_result`

src/tools/clippy/tests/ui/rename.rs

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#![allow(unknown_lints)]
6060
#![allow(unused_labels)]
6161
#![allow(ambiguous_wide_pointer_comparisons)]
62+
#![allow(unpredictable_function_pointer_comparisons)]
6263
#![allow(clippy::reversed_empty_ranges)]
6364
#![warn(clippy::almost_complete_letter_range)] //~ ERROR: lint `clippy::almost_complete_letter_range`
6465
#![warn(clippy::blacklisted_name)] //~ ERROR: lint `clippy::blacklisted_name`
@@ -74,6 +75,7 @@
7475
#![warn(clippy::eval_order_dependence)] //~ ERROR: lint `clippy::eval_order_dependence`
7576
#![warn(clippy::find_map)] //~ ERROR: lint `clippy::find_map`
7677
#![warn(clippy::filter_map)] //~ ERROR: lint `clippy::filter_map`
78+
#![warn(clippy::fn_address_comparisons)] //~ ERROR: lint `clippy::fn_address_comparisons`
7779
#![warn(clippy::identity_conversion)] //~ ERROR: lint `clippy::identity_conversion`
7880
#![warn(clippy::if_let_redundant_pattern_matching)] //~ ERROR: lint `clippy::if_let_redundant_pattern_matching`
7981
#![warn(clippy::if_let_some_result)] //~ ERROR: lint `clippy::if_let_some_result`

0 commit comments

Comments
 (0)