diff options
| author | Denis Merigoux <denis.merigoux@gmail.com> | 2018-09-06 11:57:42 -0700 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2018-11-16 14:11:59 +0200 |
| commit | 6d42574b7a22831de97a6ca458f22d011561be56 (patch) | |
| tree | 04055e1def3968b6087041fb8eefd5c150da619f /src/librustc_codegen_llvm/back | |
| parent | 730b13ab51b0885cb8a750036e9429e6c2a193f1 (diff) | |
| download | rust-6d42574b7a22831de97a6ca458f22d011561be56.tar.gz rust-6d42574b7a22831de97a6ca458f22d011561be56.zip | |
Prefixed const methods with "const" instead of "c"
Diffstat (limited to 'src/librustc_codegen_llvm/back')
| -rw-r--r-- | src/librustc_codegen_llvm/back/write.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index 7f1dafbe161..9eaafb1c21d 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -442,17 +442,17 @@ impl CommonWriteMethods for CodegenContext<'ll> { common::val_ty(v) } - fn c_bytes_in_context(&self, llcx: &'ll llvm::Context, bytes: &[u8]) -> &'ll Value { - common::c_bytes_in_context(llcx, bytes) + fn const_bytes_in_context(&self, llcx: &'ll llvm::Context, bytes: &[u8]) -> &'ll Value { + common::const_bytes_in_context(llcx, bytes) } - fn c_struct_in_context( + fn const_struct_in_context( &self, llcx: &'a llvm::Context, elts: &[&'a Value], packed: bool, ) -> &'a Value { - common::c_struct_in_context(llcx, elts, packed) + common::const_struct_in_context(llcx, elts, packed) } } @@ -926,7 +926,7 @@ unsafe fn embed_bitcode(cgcx: &CodegenContext, llcx: &llvm::Context, llmod: &llvm::Module, bitcode: Option<&[u8]>) { - let llconst = cgcx.c_bytes_in_context(llcx, bitcode.unwrap_or(&[])); + let llconst = cgcx.const_bytes_in_context(llcx, bitcode.unwrap_or(&[])); let llglobal = llvm::LLVMAddGlobal( llmod, cgcx.val_ty(llconst), @@ -946,7 +946,7 @@ unsafe fn embed_bitcode(cgcx: &CodegenContext, llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage); llvm::LLVMSetGlobalConstant(llglobal, llvm::True); - let llconst = cgcx.c_bytes_in_context(llcx, &[]); + let llconst = cgcx.const_bytes_in_context(llcx, &[]); let llglobal = llvm::LLVMAddGlobal( llmod, cgcx.val_ty(llconst), |
