about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm/back/archive.rs
diff options
context:
space:
mode:
authorIrina Popa <irinagpopa@gmail.com>2018-07-17 15:02:11 +0300
committerIrina Popa <irinagpopa@gmail.com>2018-07-30 20:10:43 +0300
commitc7669dff2af371338004cb92cd7d757bc2961d21 (patch)
tree9e78d1a1bbd917b59a93a0dc919469c74003a799 /src/librustc_codegen_llvm/back/archive.rs
parente551ed90331e236dc8fa6dadeeaa49dcdcb0c2ef (diff)
downloadrust-c7669dff2af371338004cb92cd7d757bc2961d21.tar.gz
rust-c7669dff2af371338004cb92cd7d757bc2961d21.zip
rustc_codegen_llvm: use safe references for ArchiveChild.
Diffstat (limited to 'src/librustc_codegen_llvm/back/archive.rs')
-rw-r--r--src/librustc_codegen_llvm/back/archive.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_codegen_llvm/back/archive.rs b/src/librustc_codegen_llvm/back/archive.rs
index 4ea97911830..d290753a5bc 100644
--- a/src/librustc_codegen_llvm/back/archive.rs
+++ b/src/librustc_codegen_llvm/back/archive.rs
@@ -14,7 +14,7 @@ use std::ffi::{CString, CStr};
 use std::io;
 use std::mem;
 use std::path::{Path, PathBuf};
-use std::ptr::{self, NonNull};
+use std::ptr;
 use std::str;
 
 use back::bytecode::RLIB_BYTECODE_EXTENSION;
@@ -246,7 +246,7 @@ impl<'a> ArchiveBuilder<'a> {
                     let name = CString::new(child_name)?;
                     members.push(llvm::LLVMRustArchiveMemberNew(ptr::null(),
                                                                 name.as_ptr(),
-                                                                NonNull::new(child.raw())));
+                                                                Some(child.raw)));
                     strings.push(name);
                 }
             }
@@ -284,7 +284,7 @@ impl<'a> ArchiveBuilder<'a> {
                             let name = CString::new(child_name)?;
                             let m = llvm::LLVMRustArchiveMemberNew(ptr::null(),
                                                                    name.as_ptr(),
-                                                                   NonNull::new(child.raw()));
+                                                                   Some(child.raw));
                             members.push(m);
                             strings.push(name);
                         }