correct suggestion for redundant_closure in a no_std environment

clippy_lints/src/eta_reduction.rs

@@ -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 body.params.is_empty()
-            if let Some(VecArgs::Vec(&[])) = VecArgs::hir(cx, body.value) {
+            && let Some(VecArgs::Vec(&[])) = VecArgs::hir(cx, body.value)
-                // replace `|| vec![]` with `Vec::new`
+        {
-                span_lint_and_sugg(
+            let vec_crate = if is_no_std_crate(cx) { "alloc" } else { "std" };
-                    cx,
+            // replace `|| vec![]` with `Vec::new`
-                    REDUNDANT_CLOSURE,
+            span_lint_and_sugg(
-                    expr.span,
+                cx,
-                    "redundant closure",
+                REDUNDANT_CLOSURE,
-                    "replace the closure with `Vec::new`",
+                expr.span,
-                    "std::vec::Vec::new".into(),
+                "redundant closure",
-                    Applicability::MachineApplicable,
+                "replace the closure with `Vec::new`",
-                );
+                format!("{vec_crate}::vec::Vec::new"),
-            }
+                Applicability::MachineApplicable,
+            );
         }
         // skip `foo(|| macro!())`
         return;

tests/ui/eta_nostd.fixed

@@ -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);
+}

tests/ui/eta_nostd.rs

@@ -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![]);
+}

tests/ui/eta_nostd.stderr

@@ -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
+