From 8c83935cdf87d4e3c0d9e7796fc810fb54ecbf39 Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 17 Jun 2025 13:59:53 +0300
Subject: [PATCH] apply clippy::or_fun_call
---
compiler/rustc_codegen_ssa/src/mir/debuginfo.rs | 2 +-
compiler/rustc_codegen_ssa/src/mir/naked_asm.rs | 8 ++++----
compiler/rustc_hir_typeck/src/op.rs | 2 +-
compiler/rustc_metadata/src/locator.rs | 8 ++++++--
compiler/rustc_metadata/src/native_libs.rs | 2 +-
compiler/rustc_middle/src/query/mod.rs | 2 +-
compiler/rustc_passes/src/check_export.rs | 6 +++---
compiler/rustc_session/src/filesearch.rs | 10 +++++-----
.../src/error_reporting/infer/region.rs | 2 +-
compiler/rustc_trait_selection/src/traits/normalize.rs | 2 +-
compiler/rustc_ty_utils/src/layout.rs | 7 +++----
src/tools/compiletest/src/runtest.rs | 3 ++-
src/tools/compiletest/src/runtest/coverage.rs | 6 +++---
13 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
index f731613d67e8a..025f5fb54f428 100644
--- a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
@@ -317,7 +317,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
let name = if bx.sess().fewer_names() {
None
} else {
- Some(match whole_local_var.or(fallback_var.clone()) {
+ Some(match whole_local_var.or_else(|| fallback_var.clone()) {
Some(var) if var.name != sym::empty => var.name.to_string(),
_ => format!("{local:?}"),
})
diff --git a/compiler/rustc_codegen_ssa/src/mir/naked_asm.rs b/compiler/rustc_codegen_ssa/src/mir/naked_asm.rs
index b805dc094e913..9f66457a74005 100644
--- a/compiler/rustc_codegen_ssa/src/mir/naked_asm.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/naked_asm.rs
@@ -205,7 +205,7 @@ fn prefix_and_suffix<'tcx>(
let mut end = String::new();
match asm_binary_format {
BinaryFormat::Elf => {
- let section = link_section.unwrap_or(format!(".text.{asm_name}"));
+ let section = link_section.unwrap_or_else(|| format!(".text.{asm_name}"));
let progbits = match is_arm {
true => "%progbits",
@@ -239,7 +239,7 @@ fn prefix_and_suffix<'tcx>(
}
}
BinaryFormat::MachO => {
- let section = link_section.unwrap_or("__TEXT,__text".to_string());
+ let section = link_section.unwrap_or_else(|| "__TEXT,__text".to_string());
writeln!(begin, ".pushsection {},regular,pure_instructions", section).unwrap();
writeln!(begin, ".balign {align_bytes}").unwrap();
write_linkage(&mut begin).unwrap();
@@ -256,7 +256,7 @@ fn prefix_and_suffix<'tcx>(
}
}
BinaryFormat::Coff => {
- let section = link_section.unwrap_or(format!(".text.{asm_name}"));
+ let section = link_section.unwrap_or_else(|| format!(".text.{asm_name}"));
writeln!(begin, ".pushsection {},\"xr\"", section).unwrap();
writeln!(begin, ".balign {align_bytes}").unwrap();
write_linkage(&mut begin).unwrap();
@@ -273,7 +273,7 @@ fn prefix_and_suffix<'tcx>(
}
}
BinaryFormat::Wasm => {
- let section = link_section.unwrap_or(format!(".text.{asm_name}"));
+ let section = link_section.unwrap_or_else(|| format!(".text.{asm_name}"));
writeln!(begin, ".section {section},\"\",@").unwrap();
// wasm functions cannot be aligned, so skip
diff --git a/compiler/rustc_hir_typeck/src/op.rs b/compiler/rustc_hir_typeck/src/op.rs
index 7f7921b66b572..b9d245069866a 100644
--- a/compiler/rustc_hir_typeck/src/op.rs
+++ b/compiler/rustc_hir_typeck/src/op.rs
@@ -706,7 +706,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
.sess
.source_map()
.span_to_snippet(lhs_expr.span)
- .unwrap_or("_".to_string()),
+ .unwrap_or_else(|_| "_".to_string()),
};
if op.span().can_be_used_for_suggestions() {
diff --git a/compiler/rustc_metadata/src/locator.rs b/compiler/rustc_metadata/src/locator.rs
index 79015aab5d304..259bcb1b96dbb 100644
--- a/compiler/rustc_metadata/src/locator.rs
+++ b/compiler/rustc_metadata/src/locator.rs
@@ -1196,7 +1196,7 @@ impl CrateError {
.opts
.crate_name
.clone()
- .unwrap_or("<unknown>".to_string()),
+ .unwrap_or_else(|| "<unknown>".to_string()),
is_nightly_build: sess.is_nightly_build(),
profiler_runtime: Symbol::intern(&sess.opts.unstable_opts.profiler_runtime),
locator_triple: locator.triple,
@@ -1217,7 +1217,11 @@ impl CrateError {
crate_name,
add_info: String::new(),
missing_core,
- current_crate: sess.opts.crate_name.clone().unwrap_or("<unknown>".to_string()),
+ current_crate: sess
+ .opts
+ .crate_name
+ .clone()
+ .unwrap_or_else(|| "<unknown>".to_string()),
is_nightly_build: sess.is_nightly_build(),
profiler_runtime: Symbol::intern(&sess.opts.unstable_opts.profiler_runtime),
locator_triple: sess.opts.target_triple.clone(),
diff --git a/compiler/rustc_metadata/src/native_libs.rs b/compiler/rustc_metadata/src/native_libs.rs
index 5cdeb8935f70c..f10d71f4c6540 100644
--- a/compiler/rustc_metadata/src/native_libs.rs
+++ b/compiler/rustc_metadata/src/native_libs.rs
@@ -705,7 +705,7 @@ impl<'tcx> Collector<'tcx> {
.map_or(import_name_type, |ord| Some(PeImportNameType::Ordinal(ord)));
DllImport {
- name: codegen_fn_attrs.link_name.unwrap_or(self.tcx.item_name(item)),
+ name: codegen_fn_attrs.link_name.unwrap_or_else(|| self.tcx.item_name(item)),
import_name_type,
calling_convention,
span,
diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs
index 63312eff49066..cff43372d23f6 100644
--- a/compiler/rustc_middle/src/query/mod.rs
+++ b/compiler/rustc_middle/src/query/mod.rs
@@ -1575,7 +1575,7 @@ rustc_queries! {
query vtable_allocation(key: (Ty<'tcx>, Option<ty::ExistentialTraitRef<'tcx>>)) -> mir::interpret::AllocId {
desc { |tcx| "vtable const allocation for <{} as {}>",
key.0,
- key.1.map(|trait_ref| format!("{trait_ref}")).unwrap_or("_".to_owned())
+ key.1.map(|trait_ref| format!("{trait_ref}")).unwrap_or_else(|| "_".to_owned())
}
}
diff --git a/compiler/rustc_passes/src/check_export.rs b/compiler/rustc_passes/src/check_export.rs
index b9a3849f32fec..f8f489d7d0673 100644
--- a/compiler/rustc_passes/src/check_export.rs
+++ b/compiler/rustc_passes/src/check_export.rs
@@ -53,11 +53,11 @@ impl<'tcx> ExportableItemCollector<'tcx> {
let is_pub = visibilities.is_directly_public(def_id);
if has_attr && !is_pub {
- let vis = visibilities.effective_vis(def_id).cloned().unwrap_or(
+ let vis = visibilities.effective_vis(def_id).cloned().unwrap_or_else(|| {
EffectiveVisibility::from_vis(Visibility::Restricted(
self.tcx.parent_module_from_def_id(def_id).to_local_def_id(),
- )),
- );
+ ))
+ });
let vis = vis.at_level(Level::Direct);
let span = self.tcx.def_span(def_id);
diff --git a/compiler/rustc_session/src/filesearch.rs b/compiler/rustc_session/src/filesearch.rs
index def2cc97f061f..4f8c3926207f3 100644
--- a/compiler/rustc_session/src/filesearch.rs
+++ b/compiler/rustc_session/src/filesearch.rs
@@ -209,10 +209,9 @@ pub fn get_or_default_sysroot() -> PathBuf {
//
// use `parent` twice to chop off the file name and then also the
// directory containing the dll
- let dir = dll.parent().and_then(|p| p.parent()).ok_or(format!(
- "Could not move 2 levels upper using `parent()` on {}",
- dll.display()
- ))?;
+ let dir = dll.parent().and_then(|p| p.parent()).ok_or_else(|| {
+ format!("Could not move 2 levels upper using `parent()` on {}", dll.display())
+ })?;
// if `dir` points to target's dir, move up to the sysroot
let mut sysroot_dir = if dir.ends_with(crate::config::host_tuple()) {
@@ -265,5 +264,6 @@ pub fn get_or_default_sysroot() -> PathBuf {
rustlib_path.exists().then_some(p)
}
- from_env_args_next().unwrap_or(default_from_rustc_driver_dll().expect("Failed finding sysroot"))
+ from_env_args_next()
+ .unwrap_or_else(|| default_from_rustc_driver_dll().expect("Failed finding sysroot"))
}
diff --git a/compiler/rustc_trait_selection/src/error_reporting/infer/region.rs b/compiler/rustc_trait_selection/src/error_reporting/infer/region.rs
index b8207c4f81632..5c669678ccc0c 100644
--- a/compiler/rustc_trait_selection/src/error_reporting/infer/region.rs
+++ b/compiler/rustc_trait_selection/src/error_reporting/infer/region.rs
@@ -891,7 +891,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
(b'a'..=b'z')
.map(|c| format!("'{}", c as char))
.find(|candidate| !used_names.iter().any(|e| e.as_str() == candidate))
- .unwrap_or("'lt".to_string())
+ .unwrap_or_else(|| "'lt".to_string())
};
let mut visitor = LifetimeReplaceVisitor {
diff --git a/compiler/rustc_trait_selection/src/traits/normalize.rs b/compiler/rustc_trait_selection/src/traits/normalize.rs
index 35a43b294ee04..9e02ce32b21cd 100644
--- a/compiler/rustc_trait_selection/src/traits/normalize.rs
+++ b/compiler/rustc_trait_selection/src/traits/normalize.rs
@@ -224,7 +224,7 @@ impl<'a, 'b, 'tcx> AssocTypeNormalizer<'a, 'b, 'tcx> {
)
.ok()
.flatten()
- .unwrap_or(proj.to_term(infcx.tcx));
+ .unwrap_or_else(|| proj.to_term(infcx.tcx));
PlaceholderReplacer::replace_placeholders(
infcx,
diff --git a/compiler/rustc_ty_utils/src/layout.rs b/compiler/rustc_ty_utils/src/layout.rs
index 9774263e4c951..d52228224614b 100644
--- a/compiler/rustc_ty_utils/src/layout.rs
+++ b/compiler/rustc_ty_utils/src/layout.rs
@@ -896,10 +896,9 @@ fn variant_info_for_coroutine<'tcx>(
variant_size = variant_size.max(offset + field_layout.size);
FieldInfo {
kind: FieldKind::CoroutineLocal,
- name: field_name.unwrap_or(Symbol::intern(&format!(
- ".coroutine_field{}",
- local.as_usize()
- ))),
+ name: field_name.unwrap_or_else(|| {
+ Symbol::intern(&format!(".coroutine_field{}", local.as_usize()))
+ }),
offset: offset.bytes(),
size: field_layout.size.bytes(),
align: field_layout.align.abi.bytes(),
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 75f24adb70fa5..e9b8b6bda3fac 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2368,7 +2368,8 @@ impl<'test> TestCx<'test> {
// Real paths into the libstd/libcore
let rust_src_dir = &self.config.sysroot_base.join("lib/rustlib/src/rust");
rust_src_dir.try_exists().expect(&*format!("{} should exists", rust_src_dir));
- let rust_src_dir = rust_src_dir.read_link_utf8().unwrap_or(rust_src_dir.to_path_buf());
+ let rust_src_dir =
+ rust_src_dir.read_link_utf8().unwrap_or_else(|_| rust_src_dir.to_path_buf());
normalize_path(&rust_src_dir.join("library"), "$SRC_DIR_REAL");
// eg.
diff --git a/src/tools/compiletest/src/runtest/coverage.rs b/src/tools/compiletest/src/runtest/coverage.rs
index 41cfeaee35ffb..38f0e95647490 100644
--- a/src/tools/compiletest/src/runtest/coverage.rs
+++ b/src/tools/compiletest/src/runtest/coverage.rs
@@ -357,9 +357,9 @@ impl<'test> TestCx<'test> {
// Add this line to the current subview.
subviews
.last_mut()
- .ok_or(format!(
- "unexpected subview line outside of a subview on line {line_num}"
- ))?
+ .ok_or_else(|| {
+ format!("unexpected subview line outside of a subview on line {line_num}")
+ })?
.push(line);
} else {
// This line is not part of a subview, so sort and print any