From 13b070e3560a2ecfb11d9bb11ca2ea0a8296e4d8 Mon Sep 17 00:00:00 2001 From: Jason Newcomb Date: Wed, 16 Apr 2025 16:00:14 -0400 Subject: [PATCH] clippy_dev: Fix previous renames in `rename_lint` --- clippy_dev/src/rename_lint.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/clippy_dev/src/rename_lint.rs b/clippy_dev/src/rename_lint.rs index 9f7c328712c3..be8b27c7a9e9 100644 --- a/clippy_dev/src/rename_lint.rs +++ b/clippy_dev/src/rename_lint.rs @@ -43,6 +43,17 @@ pub fn rename(clippy_version: Version, old_name: &str, new_name: &str, uplift: b let lint = &lints[lint_idx]; let old_name_prefixed = String::from_iter(["clippy::", old_name]); + let new_name_prefixed = if uplift { + new_name.to_owned() + } else { + String::from_iter(["clippy::", new_name]) + }; + + for lint in &mut renamed_lints { + if lint.new_name == old_name_prefixed { + lint.new_name.clone_from(&new_name_prefixed); + } + } match renamed_lints.binary_search_by(|x| x.old_name.cmp(&old_name_prefixed)) { Ok(_) => { println!("`{old_name}` already has a rename registered");