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_codegen_cranelift/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_codegen_cranelift/src')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/bin/cg_clif.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/bin/cg_clif.rs b/compiler/rustc_codegen_cranelift/src/bin/cg_clif.rs index 71ef4d22673..cd01acc9a83 100644 --- a/compiler/rustc_codegen_cranelift/src/bin/cg_clif.rs +++ b/compiler/rustc_codegen_cranelift/src/bin/cg_clif.rs @@ -27,8 +27,8 @@ impl rustc_driver::Callbacks for CraneliftPassesCallbacks { config.opts.cg.panic = Some(PanicStrategy::Abort); config.opts.debugging_opts.panic_abort_tests = true; config.opts.maybe_sysroot = Some( - config.opts.maybe_sysroot.clone().unwrap_or( - std::env::current_exe() + config.opts.maybe_sysroot.clone().unwrap_or_else( + || std::env::current_exe() .unwrap() .parent() .unwrap() |