diff options
| author | klensy <klensy@users.noreply.github.com> | 2025-06-17 13:59:53 +0300 |
|---|---|---|
| committer | klensy <klensy@users.noreply.github.com> | 2025-06-17 13:59:53 +0300 |
| commit | 8c83935cdf87d4e3c0d9e7796fc810fb54ecbf39 (patch) | |
| tree | b1c85aae31c3fcadcb2f0be6457f7cf87c494e23 /compiler/rustc_metadata/src | |
| parent | 55d436467c351b56253deeba209ae2553d1c243f (diff) | |
| download | rust-8c83935cdf87d4e3c0d9e7796fc810fb54ecbf39.tar.gz rust-8c83935cdf87d4e3c0d9e7796fc810fb54ecbf39.zip | |
apply clippy::or_fun_call
Diffstat (limited to 'compiler/rustc_metadata/src')
| -rw-r--r-- | compiler/rustc_metadata/src/locator.rs | 8 | ||||
| -rw-r--r-- | compiler/rustc_metadata/src/native_libs.rs | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/compiler/rustc_metadata/src/locator.rs b/compiler/rustc_metadata/src/locator.rs index 79015aab5d3..259bcb1b96d 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 5cdeb8935f7..f10d71f4c65 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, |