diff options
| author | Linus Färnstrand <faern@faern.net> | 2018-05-31 19:43:56 +0200 |
|---|---|---|
| committer | Linus Färnstrand <faern@faern.net> | 2018-05-31 19:43:56 +0200 |
| commit | 97a0d46dece080714a4fe1ac21f84ad54f6ab76d (patch) | |
| tree | 564d467c4efc51f049f84a4f61455e8bd2f16038 /src/librustc_mir/interpret | |
| parent | 8939fe60a1980dc097da19e6de32df51c18944bb (diff) | |
| download | rust-97a0d46dece080714a4fe1ac21f84ad54f6ab76d.tar.gz rust-97a0d46dece080714a4fe1ac21f84ad54f6ab76d.zip | |
Rename num -> bits and num -> out_val
Diffstat (limited to 'src/librustc_mir/interpret')
| -rw-r--r-- | src/librustc_mir/interpret/const_eval.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc_mir/interpret/const_eval.rs b/src/librustc_mir/interpret/const_eval.rs index 49ad134e593..44832df8240 100644 --- a/src/librustc_mir/interpret/const_eval.rs +++ b/src/librustc_mir/interpret/const_eval.rs @@ -348,20 +348,20 @@ impl<'mir, 'tcx> super::Machine<'mir, 'tcx> for CompileTimeEvaluator { "ctpop" | "cttz" | "cttz_nonzero" | "ctlz" | "ctlz_nonzero" | "bswap" => { let ty = substs.type_at(0); let layout_of = ecx.layout_of(ty)?; - let num = ecx.value_to_scalar(args[0])?.to_bits(layout_of.size)?; + let bits = ecx.value_to_scalar(args[0])?.to_bits(layout_of.size)?; let kind = match layout_of.abi { ty::layout::Abi::Scalar(ref scalar) => scalar.value, _ => Err(::rustc::mir::interpret::EvalErrorKind::TypeNotPrimitive(ty))?, }; - let num = if intrinsic_name.ends_with("_nonzero") { - if num == 0 { + let out_val = if intrinsic_name.ends_with("_nonzero") { + if bits == 0 { return err!(Intrinsic(format!("{} called on 0", intrinsic_name))); } - numeric_intrinsic(intrinsic_name.trim_right_matches("_nonzero"), num, kind)? + numeric_intrinsic(intrinsic_name.trim_right_matches("_nonzero"), bits, kind)? } else { - numeric_intrinsic(intrinsic_name, num, kind)? + numeric_intrinsic(intrinsic_name, bits, kind)? }; - ecx.write_scalar(dest, num, ty)?; + ecx.write_scalar(dest, out_val, ty)?; } name => return Err( |
