diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-06 19:50:30 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-06 19:50:30 +0100 |
| commit | 4da67855f13e2bb0f46b4b221c61311fd826f1de (patch) | |
| tree | 632e6d8c5d3ecb9f37127424e5ea56277f59be89 | |
| parent | 509054d4dea5a8ea1cfa382db5f7c01b620fa8d2 (diff) | |
| download | rust-4da67855f13e2bb0f46b4b221c61311fd826f1de.tar.gz rust-4da67855f13e2bb0f46b4b221c61311fd826f1de.zip | |
Rustfmt
| -rw-r--r-- | src/atomic_shim.rs | 3 | ||||
| -rw-r--r-- | src/base.rs | 3 | ||||
| -rw-r--r-- | src/constant.rs | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/src/atomic_shim.rs b/src/atomic_shim.rs index 2f0157c257b..674e6d90751 100644 --- a/src/atomic_shim.rs +++ b/src/atomic_shim.rs @@ -7,8 +7,7 @@ use crate::prelude::*; #[cfg(all(feature = "jit", unix))] #[no_mangle] -static mut __cg_clif_global_atomic_mutex: libc::pthread_mutex_t = - libc::PTHREAD_MUTEX_INITIALIZER; +static mut __cg_clif_global_atomic_mutex: libc::pthread_mutex_t = libc::PTHREAD_MUTEX_INITIALIZER; pub(crate) fn init_global_lock( module: &mut impl Module, diff --git a/src/base.rs b/src/base.rs index bfe5514b6d3..aeeb93e2142 100644 --- a/src/base.rs +++ b/src/base.rs @@ -499,7 +499,8 @@ fn codegen_stmt<'tcx>( UnOp::Neg => match layout.ty.kind() { ty::Int(IntTy::I128) => { // FIXME remove this case once ineg.i128 works - let zero = CValue::const_val(fx, layout, ty::ScalarInt::null(layout.size)); + let zero = + CValue::const_val(fx, layout, ty::ScalarInt::null(layout.size)); crate::num::codegen_int_binop(fx, BinOp::Sub, zero, operand) } ty::Int(_) => CValue::by_val(fx.bcx.ins().ineg(val), layout), diff --git a/src/constant.rs b/src/constant.rs index 41cfae4ca6e..8885a809c42 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -163,10 +163,7 @@ pub(crate) fn codegen_const_value<'tcx>( assert!(!layout.is_unsized(), "sized const value"); if layout.is_zst() { - return CValue::by_ref( - crate::Pointer::dangling(layout.align.pref), - layout, - ); + return CValue::by_ref(crate::Pointer::dangling(layout.align.pref), layout); } match const_val { @@ -186,9 +183,7 @@ pub(crate) fn codegen_const_value<'tcx>( } match x { - Scalar::Int(int) => { - CValue::const_val(fx, layout, int) - } + Scalar::Int(int) => CValue::const_val(fx, layout, int), Scalar::Ptr(ptr) => { let alloc_kind = fx.tcx.get_global_alloc(ptr.alloc_id); let base_addr = match alloc_kind { |