diff options
| author | ljedrz <ljedrz@gmail.com> | 2018-10-06 11:51:14 +0200 |
|---|---|---|
| committer | ljedrz <ljedrz@gmail.com> | 2018-11-10 19:25:24 +0100 |
| commit | 3968ada0064296f7d4077c9d1f317a3d71514f21 (patch) | |
| tree | 0e581147ea41ac755a9e3ca2e162b4abe754db14 /src/librustc_codegen_utils | |
| parent | ed5802c4d1fe396477ec149ef047223c86e9bb0b (diff) | |
| download | rust-3968ada0064296f7d4077c9d1f317a3d71514f21.tar.gz rust-3968ada0064296f7d4077c9d1f317a3d71514f21.zip | |
codegen_llvm_back: use mem::replace instead of swap where more concise
Diffstat (limited to 'src/librustc_codegen_utils')
| -rw-r--r-- | src/librustc_codegen_utils/linker.rs | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/librustc_codegen_utils/linker.rs b/src/librustc_codegen_utils/linker.rs index d9a769c4b5f..ae1d77f1521 100644 --- a/src/librustc_codegen_utils/linker.rs +++ b/src/librustc_codegen_utils/linker.rs @@ -456,9 +456,8 @@ impl<'a> Linker for GccLinker<'a> { fn finalize(&mut self) -> Command { self.hint_dynamic(); // Reset to default before returning the composed command line. - let mut cmd = Command::new(""); - ::std::mem::swap(&mut cmd, &mut self.cmd); - cmd + + ::std::mem::replace(&mut self.cmd, Command::new("")) } fn group_start(&mut self) { @@ -710,9 +709,7 @@ impl<'a> Linker for MsvcLinker<'a> { } fn finalize(&mut self) -> Command { - let mut cmd = Command::new(""); - ::std::mem::swap(&mut cmd, &mut self.cmd); - cmd + ::std::mem::replace(&mut self.cmd, Command::new("")) } // MSVC doesn't need group indicators @@ -880,9 +877,7 @@ impl<'a> Linker for EmLinker<'a> { } fn finalize(&mut self) -> Command { - let mut cmd = Command::new(""); - ::std::mem::swap(&mut cmd, &mut self.cmd); - cmd + ::std::mem::replace(&mut self.cmd, Command::new("")) } // Appears not necessary on Emscripten @@ -1080,9 +1075,7 @@ impl<'a> Linker for WasmLd<'a> { // indicative of bugs, let's prevent them. self.cmd.arg("--fatal-warnings"); - let mut cmd = Command::new(""); - ::std::mem::swap(&mut cmd, &mut self.cmd); - cmd + ::std::mem::replace(&mut self.cmd, Command::new("")) } // Not needed for now with LLD |
