diff options
| author | Nicholas-Baron <nicholas.baron.ten@gmail.com> | 2020-11-06 13:24:55 -0800 |
|---|---|---|
| committer | Nicholas-Baron <nicholas.baron.ten@gmail.com> | 2020-11-10 20:07:47 -0800 |
| commit | 261ca04c925e1844bbd3525168d129055637e60e (patch) | |
| tree | 052eab1b6fa0810f260cef027039442e5a27fd0d /compiler/rustc_session/src | |
| parent | 38030ffb4e735b26260848b744c0910a5641e1db (diff) | |
| download | rust-261ca04c925e1844bbd3525168d129055637e60e.tar.gz rust-261ca04c925e1844bbd3525168d129055637e60e.zip | |
Changed unwrap_or to unwrap_or_else in some places.
The discussion seems to have resolved that this lint is a bit "noisy" in that applying it in all places would result in a reduction in readability. A few of the trivial functions (like `Path::new`) are fine to leave outside of closures. The general rule seems to be that anything that is obviously an allocation (`Box`, `Vec`, `vec![]`) should be in a closure, even if it is a 0-sized allocation.
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/session.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs index d0aa2809789..98b7f03df38 100644 --- a/compiler/rustc_session/src/session.rs +++ b/compiler/rustc_session/src/session.rs @@ -1305,7 +1305,7 @@ pub fn build_session( early_error(sopts.error_format, &format!("Error loading host specification: {}", e)) }); - let loader = file_loader.unwrap_or(Box::new(RealFileLoader)); + let loader = file_loader.unwrap_or_else(|| Box::new(RealFileLoader)); let hash_kind = sopts.debugging_opts.src_hash_algorithm.unwrap_or_else(|| { if target_cfg.is_like_msvc { SourceFileHashAlgorithm::Sha1 |