about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-12-16 17:28:40 +0100
committerMazdak Farrokhzad <twingoow@gmail.com>2019-12-20 22:22:44 +0100
commita7aec3f207fb40f0c4c857fb91a03372ac8bcd69 (patch)
treee38449760063595a6d65b15f5beadbf8d76094d4 /src/librustc_codegen_llvm
parent01a46509a4c2dc430ebebf940a26232fdaeeba81 (diff)
downloadrust-a7aec3f207fb40f0c4c857fb91a03372ac8bcd69.tar.gz
rust-a7aec3f207fb40f0c4c857fb91a03372ac8bcd69.zip
1. ast::Mutability::{Mutable -> Mut, Immutable -> Not}.
2. mir::Mutability -> ast::Mutability.
Diffstat (limited to 'src/librustc_codegen_llvm')
-rw-r--r--src/librustc_codegen_llvm/common.rs2
-rw-r--r--src/librustc_codegen_llvm/intrinsic.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs
index ff03c1f76d8..cda8fbc3517 100644
--- a/src/librustc_codegen_llvm/common.rs
+++ b/src/librustc_codegen_llvm/common.rs
@@ -277,7 +277,7 @@ impl ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> {
                 let base_addr = match alloc_kind {
                     Some(GlobalAlloc::Memory(alloc)) => {
                         let init = const_alloc_to_llvm(self, alloc);
-                        if alloc.mutability == Mutability::Mutable {
+                        if alloc.mutability == Mutability::Mut {
                             self.static_addr_of_mut(init, alloc.align, None)
                         } else {
                             self.static_addr_of(init, alloc.align, None)
diff --git a/src/librustc_codegen_llvm/intrinsic.rs b/src/librustc_codegen_llvm/intrinsic.rs
index 900f2d2defc..e178050b369 100644
--- a/src/librustc_codegen_llvm/intrinsic.rs
+++ b/src/librustc_codegen_llvm/intrinsic.rs
@@ -1582,7 +1582,7 @@ fn generic_simd_intrinsic(
         // The second argument must be a simd vector with an element type that's a pointer
         // to the element type of the first argument
         let (pointer_count, underlying_ty) = match arg_tys[1].simd_type(tcx).kind {
-            ty::RawPtr(p) if p.ty == in_elem && p.mutbl == hir::Mutability::Mutable
+            ty::RawPtr(p) if p.ty == in_elem && p.mutbl == hir::Mutability::Mut
                 => (ptr_count(arg_tys[1].simd_type(tcx)),
                     non_ptr(arg_tys[1].simd_type(tcx))),
             _ => {