Adapt stderr and fixed files

tests/ui/unit_arg.fixed

@@ -21,13 +21,21 @@ impl Bar {
 }
 
 fn bad() {
- foo(());
- foo(());
- foo(());
- foo(());
- foo3((), 2, 2);
+ {}; foo(());
+ {
+ 1;
+ }; foo(());
+ foo(1); foo(());
+ {
+ foo(1);
+ foo(2);
+ }; foo(());
+ {}; foo3((), 2, 2);
  let b = Bar;
- b.bar(());
+ {
+ 1;
+ }; b.bar(());
+ foo(0); foo(1); taking_multiple_units((), ());
 }
 
 fn ok() {
@@ -58,6 +66,12 @@ mod issue_2945 {
  }
 }
 
+fn returning_expr() -> Option<()> {
+ foo(1); Some(())
+}
+
+fn taking_multiple_units(a: (), b: ()) {}
+
 fn main() {
  bad();
  ok();

tests/ui/unit_arg.rs

@@ -35,6 +35,7 @@ fn bad() {
  b.bar({
  1;
  });
+ taking_multiple_units(foo(0), foo(1));
 }
 
 fn ok() {
@@ -65,6 +66,12 @@ mod issue_2945 {
  }
 }
 
+fn returning_expr() -> Option<()> {
+ Some(foo(1))
+}
+
+fn taking_multiple_units(a: (), b: ()) {}
+
 fn main() {
  bad();
  ok();

tests/ui/unit_arg.stderr

@@ -1,74 +1,130 @@
 error: passing a unit value to a function
- --> $DIR/unit_arg.rs:24:9
+ --> $DIR/unit_arg.rs:24:5
  |
 LL | foo({});
- |  ^^
+ | ^^^^^^^
  |
  = note: `-D clippy::unit-arg` implied by `-D warnings`
-help: if you intended to pass a unit value, use a unit literal instead
+help: move the expressions in front of the call...
+ |
+LL | {}; foo({});
+ | ^^^
+help: ...and use unit literals instead
  |
 LL | foo(());
  | ^^
 
 error: passing a unit value to a function
- --> $DIR/unit_arg.rs:25:9
+ --> $DIR/unit_arg.rs:25:5
  |
-LL | foo({
- | _________^
+LL | / foo({
 LL | | 1;
 LL | | });
- | |_____^
-help: if you intended to pass a unit value, use a unit literal instead
+ | |______^
+help: move the expressions in front of the call...
+ |
+LL | {
+LL | 1;
+LL | }; foo({
+ |
+help: ...and use unit literals instead
  |
 LL | foo(());
  | ^^
 
 error: passing a unit value to a function
- --> $DIR/unit_arg.rs:28:9
+ --> $DIR/unit_arg.rs:28:5
  |
 LL | foo(foo(1));
- | ^^^^^^
-help: if you intended to pass a unit value, use a unit literal instead
+ | ^^^^^^^^^^^
+help: move the expressions in front of the call...
+ |
+LL | foo(1); foo(foo(1));
+ | ^^^^^^^
+help: ...and use unit literals instead
  |
 LL | foo(());
  | ^^
 
 error: passing a unit value to a function
- --> $DIR/unit_arg.rs:29:9
+ --> $DIR/unit_arg.rs:29:5
  |
-LL | foo({
- | _________^
+LL | / foo({
 LL | | foo(1);
 LL | | foo(2);
 LL | | });
- | |_____^
-help: if you intended to pass a unit value, use a unit literal instead
+ | |______^
+help: move the expressions in front of the call...
+ |
+LL | {
+LL | foo(1);
+LL | foo(2);
+LL | }; foo({
+ |
+help: ...and use unit literals instead
  |
 LL | foo(());
  | ^^
 
 error: passing a unit value to a function
- --> $DIR/unit_arg.rs:33:10
+ --> $DIR/unit_arg.rs:33:5
  |
 LL | foo3({}, 2, 2);
- | ^^
-help: if you intended to pass a unit value, use a unit literal instead
+ | ^^^^^^^^^^^^^^
+help: move the expressions in front of the call...
+ |
+LL | {}; foo3({}, 2, 2);
+ | ^^^
+help: ...and use unit literals instead
  |
 LL | foo3((), 2, 2);
  | ^^
 
 error: passing a unit value to a function
- --> $DIR/unit_arg.rs:35:11
+ --> $DIR/unit_arg.rs:35:5
  |
-LL | b.bar({
- | ___________^
+LL | / b.bar({
 LL | | 1;
 LL | | });
- | |_____^
-help: if you intended to pass a unit value, use a unit literal instead
+ | |______^
+help: move the expressions in front of the call...
+ |
+LL | {
+LL | 1;
+LL | }; b.bar({
+ |
+help: ...and use unit literals instead
  |
 LL | b.bar(());
  | ^^
 
-error: aborting due to 6 previous errors
+error: passing a unit value to a function
+ --> $DIR/unit_arg.rs:38:5
+ |
+LL | taking_multiple_units(foo(0), foo(1));
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: move the expressions in front of the call...
+ |
+LL | foo(0); foo(1); taking_multiple_units(foo(0), foo(1));
+ | ^^^^^^^^^^^^^^^
+help: ...and use unit literals instead
+ |
+LL | taking_multiple_units((), ());
+ | ^^ ^^
+
+error: passing a unit value to a function
+ --> $DIR/unit_arg.rs:70:5
+ |
+LL | Some(foo(1))
+ | ^^^^^^^^^^^^
+help: move the expressions in front of the call...
+ |
+LL | foo(1); Some(foo(1))
+ | ^^^^^^^
+help: ...and use unit literals instead
+ |
+LL | Some(())
+ | ^^
+
+error: aborting due to 8 previous errors