about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2018-12-04 09:39:09 +0100
committerOliver Scherer <github35764891676564198441@oli-obk.de>2018-12-04 09:39:09 +0100
commitd6250191a6580317adb5c5fc3b1126c46f80d8d6 (patch)
treec30ebe7f297837a78ff4083e0b36b668c82adc0c /src/librustc_codegen_llvm
parent2e00d648c059b56f0b2dc7a362a098aa627292fc (diff)
downloadrust-d6250191a6580317adb5c5fc3b1126c46f80d8d6.tar.gz
rust-d6250191a6580317adb5c5fc3b1126c46f80d8d6.zip
s/alloc_type/alloc_kind/
Diffstat (limited to 'src/librustc_codegen_llvm')
-rw-r--r--src/librustc_codegen_llvm/common.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs
index 0d9c417f522..194b6b4e270 100644
--- a/src/librustc_codegen_llvm/common.rs
+++ b/src/librustc_codegen_llvm/common.rs
@@ -316,8 +316,8 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> {
                 }
             },
             Scalar::Ptr(ptr) => {
-                let alloc_type = self.tcx.alloc_map.lock().get(ptr.alloc_id);
-                let base_addr = match alloc_type {
+                let alloc_kind = self.tcx.alloc_map.lock().get(ptr.alloc_id);
+                let base_addr = match alloc_kind {
                     Some(AllocKind::Memory(alloc)) => {
                         let init = const_alloc_to_llvm(self, alloc);
                         if alloc.mutability == Mutability::Mutable {