Auto merge of #9684 - kraktus:ref_option_ref, r=xFrednet

[rust.git] / tests / ui / unit_arg.stderr

diff --git a/tests/ui/unit_arg.stderr b/tests/ui/unit_arg.stderr
index 094cff8c98591146dd7558d321afed17894cd9d6..74d4d2f4052f7dde1a6e94a4cfbfaad533a249cf 100644 (file)
--- a/tests/ui/unit_arg.stderr
+++ b/tests/ui/unit_arg.stderr
@@ -1,5 +1,5 @@
 error: passing a unit value to a function
-  --> $DIR/unit_arg.rs:31:5
+  --> $DIR/unit_arg.rs:62:5
    |
 LL | /     foo({
 LL | |         1;
@@ -13,26 +13,26 @@ LL |         1
    |
 help: or move the expression in front of the call and replace it with the unit literal `()`
    |
-LL |     {
-LL |         1;
-LL |     };
-LL |     foo(());
+LL ~     {
+LL +         1;
+LL +     };
+LL ~     foo(());
    |
 
 error: passing a unit value to a function
-  --> $DIR/unit_arg.rs:34:5
+  --> $DIR/unit_arg.rs:65:5
    |
 LL |     foo(foo(1));
    |     ^^^^^^^^^^^
    |
 help: move the expression in front of the call and replace it with the unit literal `()`
    |
-LL |     foo(1);
-LL |     foo(());
+LL ~     foo(1);
+LL ~     foo(());
    |
 
 error: passing a unit value to a function
-  --> $DIR/unit_arg.rs:35:5
+  --> $DIR/unit_arg.rs:66:5
    |
 LL | /     foo({
 LL | |         foo(1);
@@ -46,15 +46,15 @@ LL |         foo(2)
    |
 help: or move the expression in front of the call and replace it with the unit literal `()`
    |
-LL |     {
-LL |         foo(1);
-LL |         foo(2);
-LL |     };
-LL |     foo(());
+LL ~     {
+LL +         foo(1);
+LL +         foo(2);
+LL +     };
+LL ~     foo(());
    |
 
 error: passing a unit value to a function
-  --> $DIR/unit_arg.rs:40:5
+  --> $DIR/unit_arg.rs:71:5
    |
 LL | /     b.bar({
 LL | |         1;
@@ -67,27 +67,27 @@ LL |         1
    |
 help: or move the expression in front of the call and replace it with the unit literal `()`
    |
-LL |     {
-LL |         1;
-LL |     };
-LL |     b.bar(());
+LL ~     {
+LL +         1;
+LL +     };
+LL ~     b.bar(());
    |
 
 error: passing unit values to a function
-  --> $DIR/unit_arg.rs:43:5
+  --> $DIR/unit_arg.rs:74:5
    |
 LL |     taking_multiple_units(foo(0), foo(1));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: move the expressions in front of the call and replace them with the unit literal `()`
    |
-LL |     foo(0);
-LL |     foo(1);
-LL |     taking_multiple_units((), ());
+LL ~     foo(0);
+LL +     foo(1);
+LL ~     taking_multiple_units((), ());
    |
 
 error: passing unit values to a function
-  --> $DIR/unit_arg.rs:44:5
+  --> $DIR/unit_arg.rs:75:5
    |
 LL | /     taking_multiple_units(foo(0), {
 LL | |         foo(1);
@@ -101,16 +101,16 @@ LL |         foo(2)
    |
 help: or move the expressions in front of the call and replace them with the unit literal `()`
    |
-LL |     foo(0);
-LL |     {
-LL |         foo(1);
-LL |         foo(2);
-LL |     };
-LL |     taking_multiple_units((), ());
+LL ~     foo(0);
+LL +     {
+LL +         foo(1);
+LL +         foo(2);
+LL +     };
+LL ~     taking_multiple_units((), ());
    |
 
 error: passing unit values to a function
-  --> $DIR/unit_arg.rs:48:5
+  --> $DIR/unit_arg.rs:79:5
    |
 LL | /     taking_multiple_units(
 LL | |         {
@@ -131,50 +131,56 @@ LL |             foo(3)
    |
 help: or move the expressions in front of the call and replace them with the unit literal `()`
    |
-LL |     {
-LL |         foo(0);
-LL |         foo(1);
-LL |     };
-LL |     {
-LL |         foo(2);
- ...
+LL ~     {
+LL +         foo(0);
+LL +         foo(1);
+LL +     };
+LL +     {
+LL +         foo(2);
+LL +         foo(3);
+LL +     };
+LL +     taking_multiple_units(
+LL +         (),
+LL +         (),
+LL ~     );
+   |
 
 error: passing a unit value to a function
-  --> $DIR/unit_arg.rs:59:13
+  --> $DIR/unit_arg.rs:90:13
    |
 LL |     None.or(Some(foo(2)));
    |             ^^^^^^^^^^^^
    |
 help: move the expression in front of the call and replace it with the unit literal `()`
    |
-LL |     None.or({
-LL |         foo(2);
-LL |         Some(())
-LL |     });
+LL ~     None.or({
+LL +         foo(2);
+LL +         Some(())
+LL ~     });
    |
 
 error: passing a unit value to a function
-  --> $DIR/unit_arg.rs:62:5
+  --> $DIR/unit_arg.rs:93:5
    |
-LL |     foo(foo(()))
+LL |     foo(foo(()));
    |     ^^^^^^^^^^^^
    |
 help: move the expression in front of the call and replace it with the unit literal `()`
    |
-LL |     foo(());
-LL |     foo(())
+LL ~     foo(());
+LL ~     foo(());
    |
 
 error: passing a unit value to a function
-  --> $DIR/unit_arg.rs:95:5
+  --> $DIR/unit_arg.rs:130:5
    |
 LL |     Some(foo(1))
    |     ^^^^^^^^^^^^
    |
 help: move the expression in front of the call and replace it with the unit literal `()`
    |
-LL |     foo(1);
-LL |     Some(())
+LL ~     foo(1);
+LL +     Some(())
    |
 
 error: aborting due to 10 previous errors