Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix suggestion to add unneeded space in unused_unit #6247

Merged
merged 1 commit into from
Nov 4, 2020
Merged

Fix suggestion to add unneeded space in unused_unit #6247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions clippy_lints/src/unused_unit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,17 @@ fn lint_unneeded_unit_return(cx: &EarlyContext<'_>, ty: &ast::Ty, span: Span) {
fn_source
.rfind("->")
.map_or((ty.span, Applicability::MaybeIncorrect), |rpos| {
let mut rpos = rpos;
let chars: Vec<char> = fn_source.chars().collect();
while rpos > 1 {
if let Some(c) = chars.get(rpos - 1) {
if c.is_whitespace() {
rpos -= 1;
continue;
}
}
break;
}
(
#[allow(clippy::cast_possible_truncation)]
ty.span.with_lo(BytePos(span.lo().0 + rpos as u32)),
Expand Down
31 changes: 20 additions & 11 deletions tests/ui/unused_unit.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@
struct Unitter;
impl Unitter {
#[allow(clippy::no_effect)]
pub fn get_unit<F: Fn() , G>(&self, f: F, _g: G)
where G: Fn() {
let _y: &dyn Fn() = &f;
pub fn get_unit<F: Fn(), G>(&self, f: F, _g: G)
where G: Fn() {
let _y: &dyn Fn() = &f;
(); // this should not lint, as it's not in return type position
}
}

impl Into<()> for Unitter {
#[rustfmt::skip]
fn into(self) {
fn into(self) {

}
}

trait Trait {
fn redundant<F: FnOnce() , G, H>(&self, _f: F, _g: G, _h: H)
fn redundant<F: FnOnce(), G, H>(&self, _f: F, _g: G, _h: H)
where
G: FnMut() ,
H: Fn() ;
G: FnMut(),
H: Fn();
}

impl Trait for Unitter {
fn redundant<F: FnOnce() , G, H>(&self, _f: F, _g: G, _h: H)
fn redundant<F: FnOnce(), G, H>(&self, _f: F, _g: G, _h: H)
where
G: FnMut() ,
H: Fn() {}
G: FnMut(),
H: Fn() {}
}

fn return_unit() { }
fn return_unit() { }

#[allow(clippy::needless_return)]
#[allow(clippy::never_loop)]
Expand All @@ -70,3 +70,12 @@ fn foo() {
recv(rx) -> _x => ()
}
}

#[rustfmt::skip]
fn test(){}

#[rustfmt::skip]
fn test2(){}

#[rustfmt::skip]
fn test3(){}
9 changes: 9 additions & 0 deletions tests/ui/unused_unit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,12 @@ fn foo() {
recv(rx) -> _x => ()
}
}

#[rustfmt::skip]
fn test()->(){}

#[rustfmt::skip]
fn test2() ->(){}

#[rustfmt::skip]
fn test3()-> (){}
68 changes: 43 additions & 25 deletions tests/ui/unused_unit.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error: unneeded unit return type
--> $DIR/unused_unit.rs:18:29
--> $DIR/unused_unit.rs:18:28
|
LL | pub fn get_unit<F: Fn() -> (), G>(&self, f: F, _g: G) -> ()
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`
|
note: the lint level is defined here
--> $DIR/unused_unit.rs:12:9
Expand All @@ -11,28 +11,28 @@ LL | #![deny(clippy::unused_unit)]
| ^^^^^^^^^^^^^^^^^^^

error: unneeded unit return type
--> $DIR/unused_unit.rs:19:19
--> $DIR/unused_unit.rs:19:18
|
LL | where G: Fn() -> () {
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:18:59
--> $DIR/unused_unit.rs:18:58
|
LL | pub fn get_unit<F: Fn() -> (), G>(&self, f: F, _g: G) -> ()
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:20:27
--> $DIR/unused_unit.rs:20:26
|
LL | let _y: &dyn Fn() -> () = &f;
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:27:19
--> $DIR/unused_unit.rs:27:18
|
LL | fn into(self) -> () {
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit expression
--> $DIR/unused_unit.rs:28:9
Expand All @@ -41,46 +41,46 @@ LL | ()
| ^^ help: remove the final `()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:33:30
--> $DIR/unused_unit.rs:33:29
|
LL | fn redundant<F: FnOnce() -> (), G, H>(&self, _f: F, _g: G, _h: H)
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:35:20
--> $DIR/unused_unit.rs:35:19
|
LL | G: FnMut() -> (),
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:36:17
--> $DIR/unused_unit.rs:36:16
|
LL | H: Fn() -> ();
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:40:30
--> $DIR/unused_unit.rs:40:29
|
LL | fn redundant<F: FnOnce() -> (), G, H>(&self, _f: F, _g: G, _h: H)
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:42:20
--> $DIR/unused_unit.rs:42:19
|
LL | G: FnMut() -> (),
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:43:17
--> $DIR/unused_unit.rs:43:16
|
LL | H: Fn() -> () {}
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:46:18
--> $DIR/unused_unit.rs:46:17
|
LL | fn return_unit() -> () { () }
| ^^^^^ help: remove the `-> ()`
| ^^^^^^ help: remove the `-> ()`

error: unneeded unit expression
--> $DIR/unused_unit.rs:46:26
Expand All @@ -100,5 +100,23 @@ error: unneeded `()`
LL | return();
| ^^ help: remove the `()`

error: aborting due to 16 previous errors
error: unneeded unit return type
--> $DIR/unused_unit.rs:75:10
|
LL | fn test()->(){}
| ^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:78:11
|
LL | fn test2() ->(){}
| ^^^^^ help: remove the `-> ()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:81:11
|
LL | fn test3()-> (){}
| ^^^^^ help: remove the `-> ()`

error: aborting due to 19 previous errors