From 5e36990de014931fcc98fb9aa392f2ffa67b8a94 Mon Sep 17 00:00:00 2001 From: Jason Newcomb Date: Fri, 10 Oct 2025 19:46:52 -0400 Subject: [PATCH] `clippy_dev`: Use the new ranges. --- clippy_dev/src/deprecate_lint.rs | 4 ++-- clippy_dev/src/lib.rs | 4 +++- clippy_dev/src/parse.rs | 2 +- clippy_dev/src/release.rs | 2 +- clippy_dev/src/utils.rs | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/clippy_dev/src/deprecate_lint.rs b/clippy_dev/src/deprecate_lint.rs index e6e8b4a5184c..4d99eb91e6f9 100644 --- a/clippy_dev/src/deprecate_lint.rs +++ b/clippy_dev/src/deprecate_lint.rs @@ -132,14 +132,14 @@ fn remove_lint_declaration(name: &str, path: &Path, lints: &mut Vec) -> io ); assert!( - content[lint.declaration_range.clone()].contains(&name.to_uppercase()), + content[lint.declaration_range].contains(&name.to_uppercase()), "error: `{}` does not contain lint `{}`'s declaration", path.display(), lint.name ); // Remove lint declaration (declare_clippy_lint!) - content.replace_range(lint.declaration_range.clone(), ""); + content.replace_range(lint.declaration_range, ""); // Remove the module declaration (mod xyz;) let mod_decl = format!("\nmod {name};"); diff --git a/clippy_dev/src/lib.rs b/clippy_dev/src/lib.rs index 28f5e4ac30fb..fb8b2e1c91c1 100644 --- a/clippy_dev/src/lib.rs +++ b/clippy_dev/src/lib.rs @@ -1,9 +1,11 @@ #![feature( - rustc_private, exit_status_error, if_let_guard, + new_range, + new_range_api, os_str_slice, os_string_truncate, + rustc_private, slice_split_once )] #![warn( diff --git a/clippy_dev/src/parse.rs b/clippy_dev/src/parse.rs index b81c3da73bc5..882a2dfde1f0 100644 --- a/clippy_dev/src/parse.rs +++ b/clippy_dev/src/parse.rs @@ -2,7 +2,7 @@ pub mod cursor; use self::cursor::Cursor; use crate::utils::{ErrAction, File, expect_action}; -use core::ops::Range; +use core::range::Range; use std::fs; use std::path::{Path, PathBuf}; use walkdir::{DirEntry, WalkDir}; diff --git a/clippy_dev/src/release.rs b/clippy_dev/src/release.rs index 15392dd1d292..d11070bab85b 100644 --- a/clippy_dev/src/release.rs +++ b/clippy_dev/src/release.rs @@ -23,7 +23,7 @@ pub fn bump_version(mut version: Version) { dst.push_str(&src[..package.version_range.start]); write!(dst, "\"{}\"", version.toml_display()).unwrap(); dst.push_str(&src[package.version_range.end..]); - UpdateStatus::from_changed(src.get(package.version_range.clone()) != dst.get(package.version_range)) + UpdateStatus::from_changed(src.get(package.version_range) != dst.get(package.version_range)) } }); } diff --git a/clippy_dev/src/utils.rs b/clippy_dev/src/utils.rs index 387cbe2c3ed7..526613a53c77 100644 --- a/clippy_dev/src/utils.rs +++ b/clippy_dev/src/utils.rs @@ -1,6 +1,6 @@ use core::fmt::{self, Display}; use core::num::NonZero; -use core::ops::Range; +use core::range::Range; use core::str::FromStr; use std::ffi::OsStr; use std::fs::{self, OpenOptions};