Rebase fallout

oli-obk · oli-obk · commit 400f997de3de · 2018-11-02T16:56:59.000+01:00
diff --git a/src/librustc_mir/interpret/operand.rs b/src/librustc_mir/interpret/operand.rs
@@ -226,8 +226,8 @@ impl<'tcx, Tag> Immediate<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()?),
         })
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,8 @@ impl<'tcx, Tag> Immediate<Tag> {`
`226`	`226`	`#[inline]`
`227`	`227`	`pub fn to_meta(self) -> EvalResult<'tcx, Option<Scalar<Tag>>> {`
`228`	`228`	`Ok(match self {`
`229`		`- Value::Scalar(_) => None,`
`230`		`- Value::ScalarPair(_, meta) => Some(meta.not_undef()?),`
	`229`	`+ Immediate::Scalar(_) => None,`
	`230`	`+ Immediate::ScalarPair(_, meta) => Some(meta.not_undef()?),`
`231`	`231`	`})`
`232`	`232`	`}`
`233`	`233`	`}`