diff options
| author | bors <bors@rust-lang.org> | 2023-09-03 07:35:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-03 07:35:33 +0000 |
| commit | f2568c8316805749fe616e3de08c3f7c2bec3680 (patch) | |
| tree | 62acd3e15506a4b53b29a70b7882c0c2fa0352b4 /compiler/rustc_codegen_llvm/src | |
| parent | d2f5dc9745defa7cb90a88dd8adc7d347f42d0bc (diff) | |
| parent | fb26c21c356075c0cd35d98fa0b786b7633249d8 (diff) | |
| download | rust-f2568c8316805749fe616e3de08c3f7c2bec3680.tar.gz rust-f2568c8316805749fe616e3de08c3f7c2bec3680.zip | |
Auto merge of #3050 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/archive.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/lto.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs index a82d2c5771a..f33075a8879 100644 --- a/compiler/rustc_codegen_llvm/src/back/archive.rs +++ b/compiler/rustc_codegen_llvm/src/back/archive.rs @@ -367,7 +367,7 @@ impl<'a> LlvmArchiveBuilder<'a> { match addition { Addition::File { path, name_in_archive } => { let path = CString::new(path.to_str().unwrap())?; - let name = CString::new(name_in_archive.clone())?; + let name = CString::new(name_in_archive.as_bytes())?; members.push(llvm::LLVMRustArchiveMemberNew( path.as_ptr(), name.as_ptr(), diff --git a/compiler/rustc_codegen_llvm/src/back/lto.rs b/compiler/rustc_codegen_llvm/src/back/lto.rs index b2d28cef899..c1d3392386c 100644 --- a/compiler/rustc_codegen_llvm/src/back/lto.rs +++ b/compiler/rustc_codegen_llvm/src/back/lto.rs @@ -441,7 +441,7 @@ fn thin_lto( for (i, (name, buffer)) in modules.into_iter().enumerate() { info!("local module: {} - {}", i, name); - let cname = CString::new(name.clone()).unwrap(); + let cname = CString::new(name.as_bytes()).unwrap(); thin_modules.push(llvm::ThinLTOModule { identifier: cname.as_ptr(), data: buffer.data().as_ptr(), |
