Skip to content

Commit e1dc78c

Browse files
rabisg0rabisg0
committed
Improvement: Don't show function body in needless_lifetimes
Changes the span on which the lint is reported to point to only the function return type instead of the entire function body. Fixes #5284
1 parent d8bcdac commit e1dc78c

File tree

3 files changed

+51
-81
lines changed

3 files changed

+51
-81
lines changed

‎clippy_lints/src/lifetimes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ fn check_fn_inner<'a, 'tcx>(
169169
span_lint(
170170
cx,
171171
NEEDLESS_LIFETIMES,
172-
span,
172+
decl.output.span(),
173173
"explicit lifetimes given in parameter types where they could be elided \
174174
(or replaced with `'_` if needed by type declaration)",
175175
);

‎tests/ui/issue_4266.stderr

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
2-
--> $DIR/issue_4266.rs:4:1
2+
--> $DIR/issue_4266.rs:4:32
33
|
44
LL | async fn sink1<'a>(_: &'a str) {} // lint
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^
66
|
77
= note: `-D clippy::needless-lifetimes` implied by `-D warnings`
88

99
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
10-
--> $DIR/issue_4266.rs:8:1
10+
--> $DIR/issue_4266.rs:8:40
1111
|
12-
LL | / async fn one_to_one<'a>(s: &'a str) -> &'a str {
13-
LL | | s
14-
LL | | }
15-
| |_^
12+
LL | async fn one_to_one<'a>(s: &'a str) -> &'a str {
13+
| ^^^^^^^
1614

1715
error: aborting due to 2 previous errors
1816

‎tests/ui/needless_lifetimes.stderr

Lines changed: 45 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,106 @@
11
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
2-
--> $DIR/needless_lifetimes.rs:4:1
2+
--> $DIR/needless_lifetimes.rs:4:63
33
|
44
LL | fn distinct_lifetimes<'a, 'b>(_x: &'a u8, _y: &'b u8, _z: u8) {}
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^
66
|
77
= note: `-D clippy::needless-lifetimes` implied by `-D warnings`
88

99
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
10-
--> $DIR/needless_lifetimes.rs:6:1
10+
--> $DIR/needless_lifetimes.rs:6:73
1111
|
1212
LL | fn distinct_and_static<'a, 'b>(_x: &'a u8, _y: &'b u8, _z: &'static u8) {}
13-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
13+
| ^
1414

1515
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
16-
--> $DIR/needless_lifetimes.rs:16:1
16+
--> $DIR/needless_lifetimes.rs:16:41
1717
|
18-
LL | / fn in_and_out<'a>(x: &'a u8, _y: u8) -> &'a u8 {
19-
LL | | x
20-
LL | | }
21-
| |_^
18+
LL | fn in_and_out<'a>(x: &'a u8, _y: u8) -> &'a u8 {
19+
| ^^^^^^
2220

2321
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
24-
--> $DIR/needless_lifetimes.rs:45:1
22+
--> $DIR/needless_lifetimes.rs:45:47
2523
|
26-
LL | / fn deep_reference_3<'a>(x: &'a u8, _y: u8) -> Result<&'a u8, ()> {
27-
LL | | Ok(x)
28-
LL | | }
29-
| |_^
24+
LL | fn deep_reference_3<'a>(x: &'a u8, _y: u8) -> Result<&'a u8, ()> {
25+
| ^^^^^^^^^^^^^^^^^^
3026

3127
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
32-
--> $DIR/needless_lifetimes.rs:50:1
28+
--> $DIR/needless_lifetimes.rs:50:57
3329
|
34-
LL | / fn where_clause_without_lt<'a, T>(x: &'a u8, _y: u8) -> Result<&'a u8, ()>
35-
LL | | where
36-
LL | | T: Copy,
37-
LL | | {
38-
LL | | Ok(x)
39-
LL | | }
40-
| |_^
30+
LL | fn where_clause_without_lt<'a, T>(x: &'a u8, _y: u8) -> Result<&'a u8, ()>
31+
| ^^^^^^^^^^^^^^^^^^
4132

4233
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
43-
--> $DIR/needless_lifetimes.rs:62:1
34+
--> $DIR/needless_lifetimes.rs:62:54
4435
|
4536
LL | fn lifetime_param_2<'a, 'b>(_x: Ref<'a>, _y: &'b u8) {}
46-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
37+
| ^
4738

4839
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
49-
--> $DIR/needless_lifetimes.rs:86:1
40+
--> $DIR/needless_lifetimes.rs:86:50
5041
|
51-
LL | / fn fn_bound_2<'a, F, I>(_m: Lt<'a, I>, _f: F) -> Lt<'a, I>
52-
LL | | where
53-
LL | | for<'x> F: Fn(Lt<'x, I>) -> Lt<'x, I>,
54-
LL | | {
55-
LL | | unreachable!()
56-
LL | | }
57-
| |_^
42+
LL | fn fn_bound_2<'a, F, I>(_m: Lt<'a, I>, _f: F) -> Lt<'a, I>
43+
| ^^^^^^^^^
5844

5945
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
60-
--> $DIR/needless_lifetimes.rs:120:5
46+
--> $DIR/needless_lifetimes.rs:120:38
6147
|
62-
LL | / fn self_and_out<'s>(&'s self) -> &'s u8 {
63-
LL | | &self.x
64-
LL | | }
65-
| |_____^
48+
LL | fn self_and_out<'s>(&'s self) -> &'s u8 {
49+
| ^^^^^^
6650

6751
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
68-
--> $DIR/needless_lifetimes.rs:129:5
52+
--> $DIR/needless_lifetimes.rs:129:59
6953
|
7054
LL | fn distinct_self_and_in<'s, 't>(&'s self, _x: &'t u8) {}
71-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
55+
| ^
7256

7357
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
74-
--> $DIR/needless_lifetimes.rs:148:1
58+
--> $DIR/needless_lifetimes.rs:148:41
7559
|
76-
LL | / fn struct_with_lt<'a>(_foo: Foo<'a>) -> &'a str {
77-
LL | | unimplemented!()
78-
LL | | }
79-
| |_^
60+
LL | fn struct_with_lt<'a>(_foo: Foo<'a>) -> &'a str {
61+
| ^^^^^^^
8062

8163
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
82-
--> $DIR/needless_lifetimes.rs:178:1
64+
--> $DIR/needless_lifetimes.rs:178:49
8365
|
84-
LL | / fn trait_obj_elided2<'a>(_arg: &'a dyn Drop) -> &'a str {
85-
LL | | unimplemented!()
86-
LL | | }
87-
| |_^
66+
LL | fn trait_obj_elided2<'a>(_arg: &'a dyn Drop) -> &'a str {
67+
| ^^^^^^^
8868

8969
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
90-
--> $DIR/needless_lifetimes.rs:184:1
70+
--> $DIR/needless_lifetimes.rs:184:45
9171
|
92-
LL | / fn alias_with_lt<'a>(_foo: FooAlias<'a>) -> &'a str {
93-
LL | | unimplemented!()
94-
LL | | }
95-
| |_^
72+
LL | fn alias_with_lt<'a>(_foo: FooAlias<'a>) -> &'a str {
73+
| ^^^^^^^
9674

9775
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
98-
--> $DIR/needless_lifetimes.rs:203:1
76+
--> $DIR/needless_lifetimes.rs:203:52
9977
|
100-
LL | / fn named_input_elided_output<'a>(_arg: &'a str) -> &str {
101-
LL | | unimplemented!()
102-
LL | | }
103-
| |_^
78+
LL | fn named_input_elided_output<'a>(_arg: &'a str) -> &str {
79+
| ^^^^
10480

10581
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
106-
--> $DIR/needless_lifetimes.rs:211:1
82+
--> $DIR/needless_lifetimes.rs:211:66
10783
|
108-
LL | / fn trait_bound_ok<'a, T: WithLifetime<'static>>(_: &'a u8, _: T) {
109-
LL | | unimplemented!()
110-
LL | | }
111-
| |_^
84+
LL | fn trait_bound_ok<'a, T: WithLifetime<'static>>(_: &'a u8, _: T) {
85+
| ^
11286

11387
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
114-
--> $DIR/needless_lifetimes.rs:247:1
88+
--> $DIR/needless_lifetimes.rs:247:43
11589
|
116-
LL | / fn out_return_type_lts<'a>(e: &'a str) -> Cow<'a> {
117-
LL | | unimplemented!()
118-
LL | | }
119-
| |_^
90+
LL | fn out_return_type_lts<'a>(e: &'a str) -> Cow<'a> {
91+
| ^^^^^^^
12092

12193
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
122-
--> $DIR/needless_lifetimes.rs:254:9
94+
--> $DIR/needless_lifetimes.rs:254:39
12395
|
12496
LL | fn needless_lt<'a>(x: &'a u8) {}
125-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
97+
| ^
12698

12799
error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
128-
--> $DIR/needless_lifetimes.rs:258:9
100+
--> $DIR/needless_lifetimes.rs:258:40
129101
|
130102
LL | fn needless_lt<'a>(_x: &'a u8) {}
131-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
103+
| ^
132104

133105
error: aborting due to 17 previous errors
134106

0 commit comments

Comments
 (0)