Skip to content

Commit b147b6d

Browse files
lochettilochetti
committed
Don't lint implicit_return on proc macros
1 parent 29cc5c6 commit b147b6d

File tree

4 files changed

+47
-17
lines changed

4 files changed

+47
-17
lines changed

‎clippy_lints/src/implicit_return.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_hir_and_then;
22
use clippy_utils::source::{snippet_with_applicability, snippet_with_context, walk_span_to_context};
33
use clippy_utils::visitors::for_each_expr_without_closures;
4-
use clippy_utils::{get_async_fn_body, is_async_fn};
4+
use clippy_utils::{get_async_fn_body, is_async_fn, is_from_proc_macro};
55
use core::ops::ControlFlow;
66
use rustc_errors::Applicability;
77
use rustc_hir::intravisit::FnKind;
@@ -245,6 +245,10 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitReturn {
245245
} else {
246246
body.value
247247
};
248+
249+
if is_from_proc_macro(cx, expr) {
250+
return;
251+
}
248252
lint_implicit_returns(cx, expr, expr.span.ctxt(), None);
249253
}
250254
}

‎tests/ui/implicit_return.fixed

+13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
//@aux-build: proc_macros.rs
2+
13
#![feature(lint_reasons)]
24
#![warn(clippy::implicit_return)]
35
#![allow(clippy::needless_return, clippy::needless_bool, unused, clippy::never_loop)]
46

7+
extern crate proc_macros;
8+
use proc_macros::with_span;
9+
510
fn test_end_of_fn() -> bool {
611
if true {
712
// no error!
@@ -137,3 +142,11 @@ fn check_expect() -> bool {
137142
#[expect(clippy::implicit_return)]
138143
true
139144
}
145+
146+
with_span!(
147+
span
148+
149+
fn dont_lint_proc_macro(x: usize) -> usize{
150+
x
151+
}
152+
);

‎tests/ui/implicit_return.rs

+13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
//@aux-build: proc_macros.rs
2+
13
#![feature(lint_reasons)]
24
#![warn(clippy::implicit_return)]
35
#![allow(clippy::needless_return, clippy::needless_bool, unused, clippy::never_loop)]
46

7+
extern crate proc_macros;
8+
use proc_macros::with_span;
9+
510
fn test_end_of_fn() -> bool {
611
if true {
712
// no error!
@@ -137,3 +142,11 @@ fn check_expect() -> bool {
137142
#[expect(clippy::implicit_return)]
138143
true
139144
}
145+
146+
with_span!(
147+
span
148+
149+
fn dont_lint_proc_macro(x: usize) -> usize{
150+
x
151+
}
152+
);

‎tests/ui/implicit_return.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: missing `return` statement
2-
--> tests/ui/implicit_return.rs:11:5
2+
--> tests/ui/implicit_return.rs:16:5
33
|
44
LL | true
55
| ^^^^ help: add `return` as shown: `return true`
@@ -8,85 +8,85 @@ LL | true
88
= help: to override `-D warnings` add `#[allow(clippy::implicit_return)]`
99

1010
error: missing `return` statement
11-
--> tests/ui/implicit_return.rs:15:15
11+
--> tests/ui/implicit_return.rs:20:15
1212
|
1313
LL | if true { true } else { false }
1414
| ^^^^ help: add `return` as shown: `return true`
1515

1616
error: missing `return` statement
17-
--> tests/ui/implicit_return.rs:15:29
17+
--> tests/ui/implicit_return.rs:20:29
1818
|
1919
LL | if true { true } else { false }
2020
| ^^^^^ help: add `return` as shown: `return false`
2121

2222
error: missing `return` statement
23-
--> tests/ui/implicit_return.rs:21:17
23+
--> tests/ui/implicit_return.rs:26:17
2424
|
2525
LL | true => false,
2626
| ^^^^^ help: add `return` as shown: `return false`
2727

2828
error: missing `return` statement
29-
--> tests/ui/implicit_return.rs:22:20
29+
--> tests/ui/implicit_return.rs:27:20
3030
|
3131
LL | false => { true },
3232
| ^^^^ help: add `return` as shown: `return true`
3333

3434
error: missing `return` statement
35-
--> tests/ui/implicit_return.rs:35:9
35+
--> tests/ui/implicit_return.rs:40:9
3636
|
3737
LL | break true;
3838
| ^^^^^^^^^^ help: change `break` to `return` as shown: `return true`
3939

4040
error: missing `return` statement
41-
--> tests/ui/implicit_return.rs:42:13
41+
--> tests/ui/implicit_return.rs:47:13
4242
|
4343
LL | break true;
4444
| ^^^^^^^^^^ help: change `break` to `return` as shown: `return true`
4545

4646
error: missing `return` statement
47-
--> tests/ui/implicit_return.rs:50:13
47+
--> tests/ui/implicit_return.rs:55:13
4848
|
4949
LL | break true;
5050
| ^^^^^^^^^^ help: change `break` to `return` as shown: `return true`
5151

5252
error: missing `return` statement
53-
--> tests/ui/implicit_return.rs:68:18
53+
--> tests/ui/implicit_return.rs:73:18
5454
|
5555
LL | let _ = || { true };
5656
| ^^^^ help: add `return` as shown: `return true`
5757

5858
error: missing `return` statement
59-
--> tests/ui/implicit_return.rs:69:16
59+
--> tests/ui/implicit_return.rs:74:16
6060
|
6161
LL | let _ = || true;
6262
| ^^^^ help: add `return` as shown: `return true`
6363

6464
error: missing `return` statement
65-
--> tests/ui/implicit_return.rs:77:5
65+
--> tests/ui/implicit_return.rs:82:5
6666
|
6767
LL | format!("test {}", "test")
6868
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add `return` as shown: `return format!("test {}", "test")`
6969

7070
error: missing `return` statement
71-
--> tests/ui/implicit_return.rs:86:5
71+
--> tests/ui/implicit_return.rs:91:5
7272
|
7373
LL | m!(true, false)
7474
| ^^^^^^^^^^^^^^^ help: add `return` as shown: `return m!(true, false)`
7575

7676
error: missing `return` statement
77-
--> tests/ui/implicit_return.rs:92:13
77+
--> tests/ui/implicit_return.rs:97:13
7878
|
7979
LL | break true;
8080
| ^^^^^^^^^^ help: change `break` to `return` as shown: `return true`
8181

8282
error: missing `return` statement
83-
--> tests/ui/implicit_return.rs:97:17
83+
--> tests/ui/implicit_return.rs:102:17
8484
|
8585
LL | break 'outer false;
8686
| ^^^^^^^^^^^^^^^^^^ help: change `break` to `return` as shown: `return false`
8787

8888
error: missing `return` statement
89-
--> tests/ui/implicit_return.rs:112:5
89+
--> tests/ui/implicit_return.rs:117:5
9090
|
9191
LL | / loop {
9292
LL | | m!(true);
@@ -101,7 +101,7 @@ LL + }
101101
|
102102

103103
error: missing `return` statement
104-
--> tests/ui/implicit_return.rs:126:5
104+
--> tests/ui/implicit_return.rs:131:5
105105
|
106106
LL | true
107107
| ^^^^ help: add `return` as shown: `return true`

0 commit comments

Comments
 (0)