diff options
Diffstat (limited to 'src/librustc_codegen_llvm/llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/archive_ro.rs | 5 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/ffi.rs | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/librustc_codegen_llvm/llvm/archive_ro.rs b/src/librustc_codegen_llvm/llvm/archive_ro.rs index 324d52bbef4..4cbf0d92d7b 100644 --- a/src/librustc_codegen_llvm/llvm/archive_ro.rs +++ b/src/librustc_codegen_llvm/llvm/archive_ro.rs @@ -39,8 +39,9 @@ impl ArchiveRO { pub fn open(dst: &Path) -> Result<ArchiveRO, String> { return unsafe { let s = path2cstr(dst); - let ar = super::LLVMRustOpenArchive(s.as_ptr()) - .ok_or_else(|| super::last_error().unwrap_or("failed to open archive".to_string()))?; + let ar = super::LLVMRustOpenArchive(s.as_ptr()).ok_or_else(|| { + super::last_error().unwrap_or("failed to open archive".to_string()) + })?; Ok(ArchiveRO { raw: ar }) }; diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs index ba37eaa4608..5febd2ebcaf 100644 --- a/src/librustc_codegen_llvm/llvm/ffi.rs +++ b/src/librustc_codegen_llvm/llvm/ffi.rs @@ -740,7 +740,11 @@ extern "C" { Args: *const &'a Value, Name: *const c_char) -> Option<&'a Value>; - pub fn LLVMRustBuildCatchRet(B: &'a Builder, Pad: &'a Value, BB: &'a BasicBlock) -> Option<&'a Value>; + pub fn LLVMRustBuildCatchRet( + B: &'a Builder, + Pad: &'a Value, + BB: &'a BasicBlock, + ) -> Option<&'a Value>; pub fn LLVMRustBuildCatchSwitch(Builder: &'a Builder, ParentPad: Option<&'a Value>, BB: Option<&'a BasicBlock>, @@ -1480,7 +1484,9 @@ extern "C" { pub fn LLVMRustOpenArchive(path: *const c_char) -> Option<&'static mut Archive>; pub fn LLVMRustArchiveIteratorNew(AR: &'a Archive) -> &'a mut ArchiveIterator<'a>; - pub fn LLVMRustArchiveIteratorNext(AIR: &ArchiveIterator<'a>) -> Option<&'a mut ArchiveChild<'a>>; + pub fn LLVMRustArchiveIteratorNext( + AIR: &ArchiveIterator<'a>, + ) -> Option<&'a mut ArchiveChild<'a>>; pub fn LLVMRustArchiveChildName(ACR: &ArchiveChild, size: &mut size_t) -> *const c_char; pub fn LLVMRustArchiveChildData(ACR: &ArchiveChild, size: &mut size_t) -> *const c_char; pub fn LLVMRustArchiveChildFree(ACR: &'a mut ArchiveChild<'a>); |
