Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-30 16:39:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove dead code in needless_pass_by_value

Browse source
This commit is contained in:
Guillaume Gomez 2023-06-13 16:41:16 +02:00
parent 8a1f0cd765
commit bcaf655b70
1 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
clippy_lints/src/needless_pass_by_value.rs
View file

@ -7,13 +7,12 @@ use clippy_utils::ty::{
use clippy_utils::{get_trait_def_id, is_self, paths}; use clippy_utils::{get_trait_def_id, is_self, paths};
use if_chain::if_chain; use if_chain::if_chain;
use rustc_ast::ast::Attribute; use rustc_ast::ast::Attribute;
use rustc_data_structures::fx::FxHashSet;
use rustc_errors::{Applicability, Diagnostic}; use rustc_errors::{Applicability, Diagnostic};
use rustc_hir::intravisit::FnKind; use rustc_hir::intravisit::FnKind;
use rustc_hir::{ use rustc_hir::{
BindingAnnotation, Body, FnDecl, GenericArg, HirId, Impl, ItemKind, Mutability, Node, PatKind, QPath, TyKind, BindingAnnotation, Body, FnDecl, GenericArg, HirId, Impl, ItemKind, Mutability, Node, PatKind, QPath, TyKind,
}; };
use rustc_hir::{HirIdMap, HirIdSet, LangItem}; use rustc_hir::{HirIdSet, LangItem};
use rustc_hir_typeck::expr_use_visitor as euv; use rustc_hir_typeck::expr_use_visitor as euv;
use rustc_infer::infer::TyCtxtInferExt; use rustc_infer::infer::TyCtxtInferExt;
use rustc_lint::{LateContext, LateLintPass}; use rustc_lint::{LateContext, LateLintPass};
@ -136,11 +135,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
// Collect moved variables and spans which will need dereferencings from the // Collect moved variables and spans which will need dereferencings from the
// function body. // function body.
let MovedVariablesCtxt { let MovedVariablesCtxt { moved_vars } = {
moved_vars,
spans_need_deref,
..
} = {
let mut ctx = MovedVariablesCtxt::default(); let mut ctx = MovedVariablesCtxt::default();
let infcx = cx.tcx.infer_ctxt().build(); let infcx = cx.tcx.infer_ctxt().build();
euv::ExprUseVisitor::new(&mut ctx, &infcx, fn_def_id, cx.param_env, cx.typeck_results()).consume_body(body); euv::ExprUseVisitor::new(&mut ctx, &infcx, fn_def_id, cx.param_env, cx.typeck_results()).consume_body(body);
@ -211,7 +206,6 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
} }
} }
let deref_span = spans_need_deref.get(&canonical_id);
if_chain! { if_chain! {
if is_type_diagnostic_item(cx, ty, sym::Vec); if is_type_diagnostic_item(cx, ty, sym::Vec);
if let Some(clone_spans) = if let Some(clone_spans) =
@ -247,7 +241,6 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
} }
// cannot be destructured, no need for `*` suggestion // cannot be destructured, no need for `*` suggestion
assert!(deref_span.is_none());
return; return;
} }
} }
@ -275,23 +268,12 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
); );
} }
assert!(deref_span.is_none());
return; return;
} }
} }
let mut spans = vec![(input.span, format!("&{}", snippet(cx, input.span, "_")))]; let spans = vec![(input.span, format!("&{}", snippet(cx, input.span, "_")))];
// Suggests adding `*` to dereference the added reference.
if let Some(deref_span) = deref_span {
spans.extend(
deref_span
.iter()
.copied()
.map(|span| (span, format!("*{}", snippet(cx, span, "<expr>")))),
);
spans.sort_by_key(|&(span, _)| span);
}
multispan_sugg(diag, "consider taking a reference instead", spans); multispan_sugg(diag, "consider taking a reference instead", spans);
}; };
@ -320,9 +302,6 @@ fn requires_exact_signature(attrs: &[Attribute]) -> bool {
#[derive(Default)] #[derive(Default)]
struct MovedVariablesCtxt { struct MovedVariablesCtxt {
moved_vars: HirIdSet, moved_vars: HirIdSet,
/// Spans which need to be prefixed with `*` for dereferencing the
/// suggested additional reference.
spans_need_deref: HirIdMap<FxHashSet<Span>>,
} }
impl MovedVariablesCtxt { impl MovedVariablesCtxt {