user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimize codes

Browse source
This commit is contained in:
Boot0x7c00 2025-06-09 03:05:28 +00:00
parent 29492da34b
commit 4389e177eb
1 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
clippy_lints/src/swap.rs
View file

@ -3,14 +3,14 @@ use clippy_utils::source::{snippet_indent, snippet_with_context};
use clippy_utils::sugg::Sugg;
use clippy_utils::ty::is_type_diagnostic_item;
use clippy_utils::{can_mut_borrow_both, eq_expr_value, is_in_const_context, std_or_core};
use clippy_utils::{can_mut_borrow_both, eq_expr_value, is_in_const_context, path_to_local, std_or_core};
use itertools::Itertools;
use rustc_data_structures::fx::FxIndexSet;
use rustc_hir::intravisit::{Visitor, walk_expr};
use rustc_errors::Applicability;
use rustc_hir::{AssignOpKind, Block, Expr, ExprKind, LetStmt, PatKind, Path, QPath, Stmt, StmtKind};
use rustc_hir::{AssignOpKind, Block, Expr, ExprKind, LetStmt, PatKind, QPath, Stmt, StmtKind};
use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_middle::ty;
use rustc_session::declare_lint_pass;
@ -357,16 +357,13 @@ impl<'tcx> IndexBinding<'_, 'tcx> {
let init = self.cx.expr_or_init(expr);
// We skip suggesting a variable binding in any of these cases:
// 1. Variable initialization is outside the suggestion span
// 2. Variable initialization is inside the suggestion span but the variable is not used as an index
// or elsewhere later
// 3. Variable initialization is inside the suggestion span and the variable is used as an
// index/elsewhere later, but its declaration is outside the suggestion span
// - Variable initialization is outside the suggestion span
// - Variable declaration is outside the suggestion span
// - Variable is not used as an index or elsewhere later
if !self.suggest_span.contains(init.span)
|| path_to_local(expr)
.is_some_and(|hir_id| !self.suggest_span.contains(self.cx.tcx.hir_span(hir_id)))
|| !self.is_used_other_than_swapping(first_segment.ident)
|| self
.get_res_span(expr)
.is_some_and(|span| !self.suggest_span.contains(span))
{
return String::new();
}
@ -383,21 +380,6 @@ impl<'tcx> IndexBinding<'_, 'tcx> {
}
}
fn get_res_span(&self, expr: &'tcx Expr<'tcx>) -> Option<Span> {
if let ExprKind::Path(QPath::Resolved(
_,
Path {
res: rustc_hir::def::Res::Local(hir_id),
..
},
)) = expr.kind
{
Some(self.cx.tcx.hir_span(*hir_id))
} else {
None
}
}
fn is_used_other_than_swapping(&mut self, idx_ident: Ident) -> bool {
if Self::is_used_slice_indexed(self.swap1_idx, idx_ident)
|| Self::is_used_slice_indexed(self.swap2_idx, idx_ident)