Merge commit '4c41a222ca5d1325fb4b6709395bd06e766cc042' into clippyup

[rust.git] / src / test / mir-opt / const_prop / discriminant.main.ConstProp.32bit.diff

diff --git a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff b/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
index 99fa0dcbc90c55e2dc7bdf51a879be8ad0f8ad99..706cd63a73f6aa86ebf2c67eca383772e6d339a6 100644 (file)
--- a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
+++ b/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff
@@ -41,7 +41,7 @@
           _1 = Add(move _2, const 0_i32);  // scope 0 at $DIR/discriminant.rs:11:13: 11:68
           StorageDead(_2);                 // scope 0 at $DIR/discriminant.rs:11:67: 11:68
           StorageDead(_3);                 // scope 0 at $DIR/discriminant.rs:11:68: 11:69
-          _0 = const ();                   // scope 0 at $DIR/discriminant.rs:10:11: 12:2
+          nop;                             // scope 0 at $DIR/discriminant.rs:10:11: 12:2
           StorageDead(_1);                 // scope 0 at $DIR/discriminant.rs:12:1: 12:2
           return;                          // scope 0 at $DIR/discriminant.rs:12:2: 12:2
       }