diff options
| author | Ralf Jung <post@ralfj.de> | 2017-08-07 12:57:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 12:57:14 -0700 |
| commit | a98a68b2cb263abcc1763a40375ba994bc9ee39a (patch) | |
| tree | a048341725b914277f5924a3b88f149d5b0e97bb /src | |
| parent | b59c0927f652ae18282e4a0be69d51df70379ffb (diff) | |
| parent | e7d8037ebf18aeb77662b5b59fdd7b9c1e0cbd17 (diff) | |
| download | rust-a98a68b2cb263abcc1763a40375ba994bc9ee39a.tar.gz rust-a98a68b2cb263abcc1763a40375ba994bc9ee39a.zip | |
Merge pull request #289 from RalfJung/rusutp
Update for Rust nightly
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/interpret/eval_context.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs index 21d5f4fb569..c5ca9712955 100644 --- a/src/librustc_mir/interpret/eval_context.rs +++ b/src/librustc_mir/interpret/eval_context.rs @@ -216,13 +216,11 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { pub(super) fn const_to_value(&mut self, const_val: &ConstVal<'tcx>) -> EvalResult<'tcx, Value> { use rustc::middle::const_val::ConstVal::*; - use rustc_const_math::ConstFloat; let primval = match *const_val { Integral(const_int) => PrimVal::Bytes(const_int.to_u128_unchecked()), - Float(ConstFloat::F32(f)) => PrimVal::from_f32(f), - Float(ConstFloat::F64(f)) => PrimVal::from_f64(f), + Float(val) => PrimVal::Bytes(val.bits), Bool(b) => PrimVal::from_bool(b), Char(c) => PrimVal::from_char(c), |