Merge commit '4c41a222ca5d1325fb4b6709395bd06e766cc042' into clippyup

[rust.git] / src / test / mir-opt / const_prop / scalar_literal_propagation.main.ConstProp.diff

diff --git a/src/test/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff b/src/test/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff
index a4232d178a32e6ab8e148c86af3739a5c24b9a44..af48ff0b098e7e8bd0397df26c30eba2138cb3ac 100644 (file)
--- a/src/test/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff
+++ b/src/test/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff
@@ -27,7 +27,7 @@
       bb1: {
           StorageDead(_3);                 // scope 1 at $DIR/scalar_literal_propagation.rs:4:14: 4:15
           StorageDead(_2);                 // scope 1 at $DIR/scalar_literal_propagation.rs:4:15: 4:16
-          _0 = const ();                   // scope 0 at $DIR/scalar_literal_propagation.rs:2:11: 5:2
+          nop;                             // scope 0 at $DIR/scalar_literal_propagation.rs:2:11: 5:2
           StorageDead(_1);                 // scope 0 at $DIR/scalar_literal_propagation.rs:5:1: 5:2
           return;                          // scope 0 at $DIR/scalar_literal_propagation.rs:5:2: 5:2
       }