1
Fork 0

correct suggestion for redundant_closure in a no_std environment

This commit is contained in:
lapla-cogito 2025-01-14 20:22:14 +09:00
parent 913592373d
commit 43b29da91e
No known key found for this signature in database
GPG key ID: B39C71D9F127FF9F
4 changed files with 48 additions and 14 deletions

View file

@ -3,7 +3,9 @@ use clippy_utils::higher::VecArgs;
use clippy_utils::source::snippet_opt;
use clippy_utils::ty::get_type_diagnostic_name;
use clippy_utils::usage::{local_used_after_expr, local_used_in};
use clippy_utils::{get_path_from_caller_to_method_type, is_adjusted, path_to_local, path_to_local_id};
use clippy_utils::{
get_path_from_caller_to_method_type, is_adjusted, is_no_std_crate, path_to_local, path_to_local_id,
};
use rustc_errors::Applicability;
use rustc_hir::{BindingMode, Expr, ExprKind, FnRetTy, Param, PatKind, QPath, Safety, TyKind};
use rustc_infer::infer::TyCtxtInferExt;
@ -101,19 +103,20 @@ fn check_closure<'tcx>(cx: &LateContext<'tcx>, outer_receiver: Option<&Expr<'tcx
};
if body.value.span.from_expansion() {
if body.params.is_empty() {
if let Some(VecArgs::Vec(&[])) = VecArgs::hir(cx, body.value) {
// replace `|| vec![]` with `Vec::new`
span_lint_and_sugg(
cx,
REDUNDANT_CLOSURE,
expr.span,
"redundant closure",
"replace the closure with `Vec::new`",
"std::vec::Vec::new".into(),
Applicability::MachineApplicable,
);
}
if body.params.is_empty()
&& let Some(VecArgs::Vec(&[])) = VecArgs::hir(cx, body.value)
{
let vec_crate = if is_no_std_crate(cx) { "alloc" } else { "std" };
// replace `|| vec![]` with `Vec::new`
span_lint_and_sugg(
cx,
REDUNDANT_CLOSURE,
expr.span,
"redundant closure",
"replace the closure with `Vec::new`",
format!("{vec_crate}::vec::Vec::new"),
Applicability::MachineApplicable,
);
}
// skip `foo(|| macro!())`
return;

10
tests/ui/eta_nostd.fixed Normal file
View file

@ -0,0 +1,10 @@
#![warn(clippy::redundant_closure)]
#![no_std]
extern crate alloc;
use alloc::vec;
use alloc::vec::Vec;
fn issue_13895() {
let _: Option<Vec<u8>> = true.then(alloc::vec::Vec::new);
}

10
tests/ui/eta_nostd.rs Normal file
View file

@ -0,0 +1,10 @@
#![warn(clippy::redundant_closure)]
#![no_std]
extern crate alloc;
use alloc::vec;
use alloc::vec::Vec;
fn issue_13895() {
let _: Option<Vec<u8>> = true.then(|| vec![]);
}

11
tests/ui/eta_nostd.stderr Normal file
View file

@ -0,0 +1,11 @@
error: redundant closure
--> tests/ui/eta_nostd.rs:9:40
|
LL | let _: Option<Vec<u8>> = true.then(|| vec![]);
| ^^^^^^^^^ help: replace the closure with `Vec::new`: `alloc::vec::Vec::new`
|
= note: `-D clippy::redundant-closure` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::redundant_closure)]`
error: aborting due to 1 previous error