diff options
| author | bors <bors@rust-lang.org> | 2021-01-15 09:27:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-15 09:27:21 +0000 |
| commit | 4e208f6a3afb42528878b0f3464e337c4bf3bbc8 (patch) | |
| tree | 21529ff86f6f364980511a8cb4cb7a0001ae29c0 /compiler/rustc_codegen_ssa/src | |
| parent | dcf622eb70aebe16d40c5f88fa2a41fa7019541c (diff) | |
| parent | 7286be15fa3f18ea4bd5b6ce481426f7d78e4a57 (diff) | |
| download | rust-4e208f6a3afb42528878b0f3464e337c4bf3bbc8.tar.gz rust-4e208f6a3afb42528878b0f3464e337c4bf3bbc8.zip | |
Auto merge of #81035 - JohnTitor:rollup-9m03awf, r=JohnTitor
Rollup of 5 pull requests
Successful merges:
- #80254 (Don't try to add nested predicate to Rustdoc auto-trait `ParamEnv`)
- #80834 (Remove unreachable panics from VecDeque::{front/back}[_mut])
- #80944 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)
- #81008 (Don't ICE when computing a layout of a generator tainted by errors)
- #81023 (Remove doctree::Variant)
Failed merges:
- #81033 (Remove useless `clean::Variant` struct)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 728795cf50b..ff77db9eab8 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -166,7 +166,7 @@ fn get_linker( _ => match flavor { LinkerFlavor::Lld(f) => Command::lld(linker, f), LinkerFlavor::Msvc if sess.opts.cg.linker.is_none() && sess.target.linker.is_none() => { - Command::new(msvc_tool.as_ref().map(|t| t.path()).unwrap_or(linker)) + Command::new(msvc_tool.as_ref().map_or(linker, |t| t.path())) } _ => Command::new(linker), }, |