Skip to content

Commit

Permalink
Auto merge of #9849 - koka831:fix/9748, r=Manishearth
Browse files Browse the repository at this point in the history 
Allow return types for closures with lifetime binder

fix #9748

changelog: Fix [`unused_unit`] Allow return types for closures with lifetime binder
  • Loading branch information
@bors
bors committed Nov 15, 2022
2 parents 5b0d727 + 7c4611c commit 38e0590
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 22 deletions.
8 changes: 6 additions & 2 deletions clippy_lints/src/unused_unit.rs
View file
@@ -1,8 +1,7 @@
use clippy_utils::diagnostics::span_lint_and_sugg;
use clippy_utils::source::{position_before_rarrow, snippet_opt};
use if_chain::if_chain;
use rustc_ast::ast;
use rustc_ast::visit::FnKind;
use rustc_ast::{ast, visit::FnKind, ClosureBinder};
use rustc_errors::Applicability;
use rustc_lint::{EarlyContext, EarlyLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
Expand Down Expand Up @@ -43,6 +42,11 @@ impl EarlyLintPass for UnusedUnit {
if let ast::TyKind::Tup(ref vals) = ty.kind;
if vals.is_empty() && !ty.span.from_expansion() && get_def(span) == get_def(ty.span);
then {
// implicit types in closure signatures are forbidden when `for<...>` is present
if let FnKind::Closure(&ClosureBinder::For { .. }, ..) = kind {
return;
}

lint_unneeded_unit_return(cx, ty, span);
}
}
Expand Down
7 changes: 7 additions & 0 deletions tests/ui/unused_unit.fixed
View file
Expand Up @@ -7,6 +7,7 @@
// test of the JSON error format.

#![feature(custom_inner_attributes)]
#![feature(closure_lifetime_binder)]
#![rustfmt::skip]

#![deny(clippy::unused_unit)]
Expand Down Expand Up @@ -87,3 +88,9 @@ fn macro_expr() {
}
e!()
}

mod issue9748 {
fn main() {
let _ = for<'a> |_: &'a u32| -> () {};
}
}
7 changes: 7 additions & 0 deletions tests/ui/unused_unit.rs
View file
Expand Up @@ -7,6 +7,7 @@
// test of the JSON error format.

#![feature(custom_inner_attributes)]
#![feature(closure_lifetime_binder)]
#![rustfmt::skip]

#![deny(clippy::unused_unit)]
Expand Down Expand Up @@ -87,3 +88,9 @@ fn macro_expr() {
}
e!()
}

mod issue9748 {
fn main() {
let _ = for<'a> |_: &'a u32| -> () {};
}
}
40 changes: 20 additions & 20 deletions tests/ui/unused_unit.stderr
View file
@@ -1,119 +1,119 @@
error: unneeded unit return type
--> $DIR/unused_unit.rs:19:58
--> $DIR/unused_unit.rs:20:58
|
LL | pub fn get_unit<F: Fn() -> (), G>(&self, f: F, _g: G) -> ()
| ^^^^^^ help: remove the `-> ()`
|
note: the lint level is defined here
--> $DIR/unused_unit.rs:12:9
--> $DIR/unused_unit.rs:13:9
|
LL | #![deny(clippy::unused_unit)]
| ^^^^^^^^^^^^^^^^^^^

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

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

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

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

error: unneeded unit expression
--> $DIR/unused_unit.rs:29:9
--> $DIR/unused_unit.rs:30:9
|
LL | ()
| ^^ help: remove the final `()`

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

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

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

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

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

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

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

error: unneeded unit expression
--> $DIR/unused_unit.rs:47:26
--> $DIR/unused_unit.rs:48:26
|
LL | fn return_unit() -> () { () }
| ^^ help: remove the final `()`

error: unneeded `()`
--> $DIR/unused_unit.rs:57:14
--> $DIR/unused_unit.rs:58:14
|
LL | break();
| ^^ help: remove the `()`

error: unneeded `()`
--> $DIR/unused_unit.rs:59:11
--> $DIR/unused_unit.rs:60:11
|
LL | return();
| ^^ help: remove the `()`

error: unneeded unit return type
--> $DIR/unused_unit.rs:76:10
--> $DIR/unused_unit.rs:77:10
|
LL | fn test()->(){}
| ^^^^ help: remove the `-> ()`

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

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

0 comments on commit 38e0590

Please sign in to comment.