From 400f997de3de3ae43d7f7675e8e08f29282273aa Mon Sep 17 00:00:00 2001
From: Oliver Scherer <github35764891676564198441@oli-obk.de>
Date: Fri, 2 Nov 2018 13:06:45 +0100
Subject: [PATCH] Rebase fallout

---
 src/librustc_mir/interpret/operand.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librustc_mir/interpret/operand.rs b/src/librustc_mir/interpret/operand.rs
index 440a7525b4d..0da03009448 100644
--- a/src/librustc_mir/interpret/operand.rs
+++ b/src/librustc_mir/interpret/operand.rs
@@ -226,8 +226,8 @@ pub fn to_scalar_ptr(self) -> EvalResult<'tcx, Scalar<Tag>> {
     #[inline]
     pub fn to_meta(self) -> EvalResult<'tcx, Option<Scalar<Tag>>> {
         Ok(match self {
-            Value::Scalar(_) => None,
-            Value::ScalarPair(_, meta) => Some(meta.not_undef()?),
+            Immediate::Scalar(_) => None,
+            Immediate::ScalarPair(_, meta) => Some(meta.not_undef()?),
         })
     }
 }