Skip to content

Commit

Permalink
Update test files
Browse files Browse the repository at this point in the history
  • Loading branch information
flip1995 committed Feb 17, 2020
1 parent fad122e commit 5eba680
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 109 deletions.
79 changes: 0 additions & 79 deletions tests/ui/unit_arg.fixed

This file was deleted.

15 changes: 14 additions & 1 deletion tests/ui/unit_arg.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// run-rustfix
#![warn(clippy::unit_arg)]
#![allow(clippy::no_effect, unused_must_use, unused_variables)]

Expand Down Expand Up @@ -36,6 +35,20 @@ fn bad() {
1;
});
taking_multiple_units(foo(0), foo(1));
taking_multiple_units(foo(0), {
foo(1);
foo(2);
});
taking_multiple_units(
{
foo(0);
foo(1);
},
{
foo(2);
foo(3);
},
);
}

fn ok() {
Expand Down
128 changes: 99 additions & 29 deletions tests/ui/unit_arg.stderr
Original file line number Diff line number Diff line change
@@ -1,141 +1,211 @@
error: passing a unit value to a function
--> $DIR/unit_arg.rs:24:5
--> $DIR/unit_arg.rs:23:5
|
LL | foo({});
| ^^^^^^^
|
= note: `-D clippy::unit-arg` implied by `-D warnings`
help: move the expressions in front of the call...
|
LL | {}; foo({});
| ^^^
LL | {};
|
help: ...and use unit literals instead
|
LL | foo(());
| ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:25:5
--> $DIR/unit_arg.rs:24:5
|
LL | / foo({
LL | | 1;
LL | | });
| |______^
|
help: move the expressions in front of the call...
help: remove the semicolon from the last statement in the block
|
LL | 1
|
help: or move the expressions in front of the call...
|
LL | {
LL | 1;
LL | }; foo({
LL | };
|
help: ...and use unit literals instead
|
LL | foo(());
| ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:28:5
--> $DIR/unit_arg.rs:27:5
|
LL | foo(foo(1));
| ^^^^^^^^^^^
|
help: move the expressions in front of the call...
|
LL | foo(1); foo(foo(1));
| ^^^^^^^
LL | foo(1);
|
help: ...and use unit literals instead
|
LL | foo(());
| ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:29:5
--> $DIR/unit_arg.rs:28:5
|
LL | / foo({
LL | | foo(1);
LL | | foo(2);
LL | | });
| |______^
|
help: move the expressions in front of the call...
help: remove the semicolon from the last statement in the block
|
LL | foo(2)
|
help: or move the expressions in front of the call...
|
LL | {
LL | foo(1);
LL | foo(2);
LL | }; foo({
LL | };
|
help: ...and use unit literals instead
|
LL | foo(());
| ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:33:5
--> $DIR/unit_arg.rs:32:5
|
LL | foo3({}, 2, 2);
| ^^^^^^^^^^^^^^
|
help: move the expressions in front of the call...
|
LL | {}; foo3({}, 2, 2);
| ^^^
LL | {};
|
help: ...and use unit literals instead
|
LL | foo3((), 2, 2);
| ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:35:5
--> $DIR/unit_arg.rs:34:5
|
LL | / b.bar({
LL | | 1;
LL | | });
| |______^
|
help: move the expressions in front of the call...
help: remove the semicolon from the last statement in the block
|
LL | 1
|
help: or move the expressions in front of the call...
|
LL | {
LL | 1;
LL | }; b.bar({
LL | };
|
help: ...and use unit literals instead
|
LL | b.bar(());
| ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:38:5
--> $DIR/unit_arg.rs:37: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));
| ^^^^^^^^^^^^^^^
LL | foo(0);
LL | foo(1);
|
help: ...and use unit literals instead
|
LL | taking_multiple_units((), foo(1));
| ^^
LL | taking_multiple_units((), ());
| ^^ ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:38:5
|
LL | / taking_multiple_units(foo(0), {
LL | | foo(1);
LL | | foo(2);
LL | | });
| |______^
|
help: remove the semicolon from the last statement in the block
|
LL | foo(2)
|
help: or move the expressions in front of the call...
|
LL | foo(0);
LL | {
LL | foo(1);
LL | foo(2);
LL | };
|
help: ...and use unit literals instead
|
LL | taking_multiple_units((), ());
| ^^ ^^

error: passing a unit value to a function
--> $DIR/unit_arg.rs:42:5
|
LL | / taking_multiple_units(
LL | | {
LL | | foo(0);
LL | | foo(1);
... |
LL | | },
LL | | );
| |_____^
|
help: remove the semicolon from the last statement in the block
|
LL | foo(1)
|
help: remove the semicolon from the last statement in the block
|
LL | foo(3)
|
help: or move the expressions in front of the call...
|
LL | {
LL | foo(0);
LL | foo(1);
LL | };
LL | {
LL | foo(2);
...
help: ...and use unit literals instead
|
LL | taking_multiple_units(foo(0), ());
| ^^
LL | (),
LL | (),
|

error: passing a unit value to a function
--> $DIR/unit_arg.rs:71:5
--> $DIR/unit_arg.rs:84:5
|
LL | Some(foo(1))
| ^^^^^^^^^^^^
|
help: move the expressions in front of the call...
|
LL | foo(1); Some(foo(1))
| ^^^^^^^
LL | foo(1);
|
help: ...and use unit literals instead
|
LL | Some(())
| ^^

error: aborting due to 8 previous errors
error: aborting due to 10 previous errors

0 comments on commit 5eba680

Please sign in to comment.