From a7aec3f207fb40f0c4c857fb91a03372ac8bcd69 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Mon, 16 Dec 2019 17:28:40 +0100 Subject: 1. ast::Mutability::{Mutable -> Mut, Immutable -> Not}. 2. mir::Mutability -> ast::Mutability. --- src/librustc_codegen_llvm/common.rs | 2 +- src/librustc_codegen_llvm/intrinsic.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/librustc_codegen_llvm') 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))), _ => { -- cgit 1.4.1-3-g733a5