diff options
| author | Philipp Hansch <dev@phansch.net> | 2018-12-09 15:56:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 15:56:29 +0100 |
| commit | 06ded0ea50dc943d48a9f7f10cfa1a885a77fb7b (patch) | |
| tree | 1121b3c2f126f1d7c131e632a8294500cb46fd97 | |
| parent | 8e1cd9e83e3bf0481d186acb9b9eaa7700173177 (diff) | |
| parent | 43542f8d89e178a81976d324b23efd5800071dfe (diff) | |
| download | rust-06ded0ea50dc943d48a9f7f10cfa1a885a77fb7b.tar.gz rust-06ded0ea50dc943d48a9f7f10cfa1a885a77fb7b.zip | |
Merge pull request #3516 from phansch/remove_run_rustfix_annotation
Remove a run-rustfix annotation (for now)
| -rw-r--r-- | tests/ui/unused_unit.rs | 1 | ||||
| -rw-r--r-- | tests/ui/unused_unit.stderr | 34 |
2 files changed, 17 insertions, 18 deletions
diff --git a/tests/ui/unused_unit.rs b/tests/ui/unused_unit.rs index a7f08c28939..3930eecf1b7 100644 --- a/tests/ui/unused_unit.rs +++ b/tests/ui/unused_unit.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// run-rustfix // compile-pass // The output for humans should just highlight the whole span without showing diff --git a/tests/ui/unused_unit.stderr b/tests/ui/unused_unit.stderr index b5d5bdbcbee..92d0095c0b5 100644 --- a/tests/ui/unused_unit.stderr +++ b/tests/ui/unused_unit.stderr @@ -1,51 +1,51 @@ error: unneeded unit return type - --> $DIR/unused_unit.rs:28:59 + --> $DIR/unused_unit.rs:27:59 | -28 | pub fn get_unit<F: Fn() -> (), G>(&self, f: F, _g: G) -> +27 | pub fn get_unit<F: Fn() -> (), G>(&self, f: F, _g: G) -> | ___________________________________________________________^ -29 | | () +28 | | () | |__________^ help: remove the `-> ()` | note: lint level defined here - --> $DIR/unused_unit.rs:21:9 + --> $DIR/unused_unit.rs:20:9 | -21 | #![deny(clippy::unused_unit)] +20 | #![deny(clippy::unused_unit)] | ^^^^^^^^^^^^^^^^^^^ error: unneeded unit return type - --> $DIR/unused_unit.rs:37:19 + --> $DIR/unused_unit.rs:36:19 | -37 | fn into(self) -> () { +36 | fn into(self) -> () { | ^^^^^ help: remove the `-> ()` error: unneeded unit expression - --> $DIR/unused_unit.rs:38:9 + --> $DIR/unused_unit.rs:37:9 | -38 | () +37 | () | ^^ help: remove the final `()` error: unneeded unit return type - --> $DIR/unused_unit.rs:42:18 + --> $DIR/unused_unit.rs:41:18 | -42 | fn return_unit() -> () { () } +41 | fn return_unit() -> () { () } | ^^^^^ help: remove the `-> ()` error: unneeded unit expression - --> $DIR/unused_unit.rs:42:26 + --> $DIR/unused_unit.rs:41:26 | -42 | fn return_unit() -> () { () } +41 | fn return_unit() -> () { () } | ^^ help: remove the final `()` error: unneeded `()` - --> $DIR/unused_unit.rs:49:14 + --> $DIR/unused_unit.rs:48:14 | -49 | break(); +48 | break(); | ^^ help: remove the `()` error: unneeded `()` - --> $DIR/unused_unit.rs:51:11 + --> $DIR/unused_unit.rs:50:11 | -51 | return(); +50 | return(); | ^^ help: remove the `()` error: aborting due to 7 previous errors |