Skip to content

Commit b260f26

Browse files
ada4aada4a
committed
clean-up
- inline `array_span_lint` - use `match` instead of `if-let` - give a more descriptive help message
1 parent aa1fa10 commit b260f26

File tree

4 files changed

+105
-96
lines changed

4 files changed

+105
-96
lines changed

‎clippy_lints/src/zero_repeat_side_effects.rs‎

Lines changed: 32 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use clippy_utils::diagnostics::span_lint_and_sugg;
1+
use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::higher::VecArgs;
33
use clippy_utils::source::snippet;
44
use clippy_utils::visitors::for_each_expr_without_closures;
@@ -7,9 +7,7 @@ use rustc_data_structures::packed::Pu128;
77
use rustc_errors::Applicability;
88
use rustc_hir::{ConstArgKind, ExprKind, Node};
99
use rustc_lint::{LateContext, LateLintPass};
10-
use rustc_middle::ty::Ty;
1110
use rustc_session::declare_lint_pass;
12-
use rustc_span::Span;
1311

1412
declare_clippy_lint! {
1513
/// ### What it does
@@ -85,77 +83,39 @@ fn inner_check(cx: &LateContext<'_>, expr: &'_ rustc_hir::Expr<'_>, inner_expr:
8583
let parent_hir_node = cx.tcx.parent_hir_node(expr.hir_id);
8684
let return_type = cx.typeck_results().expr_ty(expr);
8785

88-
if let Node::LetStmt(l) = parent_hir_node {
89-
array_span_lint(
90-
cx,
86+
let inner_expr = snippet(cx, inner_expr.span.source_callsite(), "..");
87+
let vec = if is_vec { "vec!" } else { "" };
88+
89+
let (span, sugg) = match parent_hir_node {
90+
Node::LetStmt(l) => (
9191
l.span,
92-
inner_expr.span,
93-
l.pat.span,
94-
Some(return_type),
95-
is_vec,
96-
false,
97-
);
98-
} else if let Node::Expr(x) = parent_hir_node
99-
&& let ExprKind::Assign(l, _, _) = x.kind
100-
{
101-
array_span_lint(cx, x.span, inner_expr.span, l.span, Some(return_type), is_vec, true);
102-
} else {
103-
span_lint_and_sugg(
104-
cx,
105-
ZERO_REPEAT_SIDE_EFFECTS,
106-
expr.span.source_callsite(),
107-
"function or method calls as the initial value in zero-sized array initializers may cause side effects",
108-
"consider using",
10992
format!(
110-
"{{ {}; {}[] as {return_type} }}",
111-
snippet(cx, inner_expr.span.source_callsite(), ".."),
112-
if is_vec { "vec!" } else { "" },
93+
"{inner_expr}; let {var_name}: {return_type} = {vec}[];",
94+
var_name = snippet(cx, l.pat.span.source_callsite(), "..")
11395
),
114-
Applicability::Unspecified,
115-
);
116-
}
117-
}
118-
}
119-
120-
fn array_span_lint(
121-
cx: &LateContext<'_>,
122-
expr_span: Span,
123-
func_call_span: Span,
124-
variable_name_span: Span,
125-
expr_ty: Option<Ty<'_>>,
126-
is_vec: bool,
127-
is_assign: bool,
128-
) {
129-
let has_ty = expr_ty.is_some();
130-
131-
span_lint_and_sugg(
132-
cx,
133-
ZERO_REPEAT_SIDE_EFFECTS,
134-
expr_span.source_callsite(),
135-
"function or method calls as the initial value in zero-sized array initializers may cause side effects",
136-
"consider using",
137-
format!(
138-
"{}; {}{}{} = {}[]{}{}",
139-
snippet(cx, func_call_span.source_callsite(), ".."),
140-
if has_ty && !is_assign { "let " } else { "" },
141-
snippet(cx, variable_name_span.source_callsite(), ".."),
142-
if let Some(ty) = expr_ty
143-
&& !is_assign
144-
{
145-
format!(": {ty}")
146-
} else {
147-
String::new()
148-
},
149-
if is_vec { "vec!" } else { "" },
150-
if let Some(ty) = expr_ty
151-
&& is_assign
152-
{
153-
format!(" as {ty}")
154-
} else {
155-
String::new()
96+
),
97+
Node::Expr(x) if let ExprKind::Assign(l, _, _) = x.kind => (
98+
x.span,
99+
format!(
100+
"{inner_expr}; {var_name} = {vec}[] as {return_type}",
101+
var_name = snippet(cx, l.span.source_callsite(), "..")
102+
),
103+
),
104+
_ => (expr.span, format!("{{ {inner_expr}; {vec}[] as {return_type} }}")),
105+
};
106+
span_lint_and_then(
107+
cx,
108+
ZERO_REPEAT_SIDE_EFFECTS,
109+
span.source_callsite(),
110+
"function or method calls as the initial value in zero-sized array initializers may cause side effects",
111+
|diag| {
112+
diag.span_suggestion_verbose(
113+
span.source_callsite(),
114+
"consider performing the side effect separately",
115+
sugg,
116+
Applicability::Unspecified,
117+
);
156118
},
157-
if is_assign { "" } else { ";" }
158-
),
159-
Applicability::Unspecified,
160-
);
119+
);
120+
}
161121
}

‎tests/ui/zero_repeat_side_effects.fixed‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![warn(clippy::zero_repeat_side_effects)]
2-
#![allow(clippy::unnecessary_operation)]
3-
#![allow(clippy::useless_vec)]
4-
#![allow(clippy::needless_late_init)]
2+
#![allow(clippy::unnecessary_operation, clippy::useless_vec, clippy::needless_late_init)]
53

64
fn f() -> i32 {
75
println!("side effect");

‎tests/ui/zero_repeat_side_effects.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#![warn(clippy::zero_repeat_side_effects)]
2-
#![allow(clippy::unnecessary_operation)]
3-
#![allow(clippy::useless_vec)]
4-
#![allow(clippy::needless_late_init)]
2+
#![allow(clippy::unnecessary_operation, clippy::useless_vec, clippy::needless_late_init)]
53

64
fn f() -> i32 {
75
println!("side effect");

‎tests/ui/zero_repeat_side_effects.stderr‎

Lines changed: 71 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,112 @@
11
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
2-
--> tests/ui/zero_repeat_side_effects.rs:18:5
2+
--> tests/ui/zero_repeat_side_effects.rs:16:5
33
|
44
LL | let a = [f(); 0];
5-
| ^^^^^^^^^^^^^^^^^ help: consider using: `f(); let a: [i32; 0] = [];`
5+
| ^^^^^^^^^^^^^^^^^
66
|
77
= note: `-D clippy::zero-repeat-side-effects` implied by `-D warnings`
88
= help: to override `-D warnings` add `#[allow(clippy::zero_repeat_side_effects)]`
9+
help: consider performing the side effect separately
10+
|
11+
LL - let a = [f(); 0];
12+
LL + f(); let a: [i32; 0] = [];
13+
|
914

1015
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
11-
--> tests/ui/zero_repeat_side_effects.rs:21:5
16+
--> tests/ui/zero_repeat_side_effects.rs:19:5
1217
|
1318
LL | b = [f(); 0];
14-
| ^^^^^^^^^^^^ help: consider using: `f(); b = [] as [i32; 0]`
19+
| ^^^^^^^^^^^^
20+
|
21+
help: consider performing the side effect separately
22+
|
23+
LL - b = [f(); 0];
24+
LL + f(); b = [] as [i32; 0];
25+
|
1526

1627
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
17-
--> tests/ui/zero_repeat_side_effects.rs:26:5
28+
--> tests/ui/zero_repeat_side_effects.rs:24:5
1829
|
1930
LL | let c = vec![f(); 0];
20-
| ^^^^^^^^^^^^^^^^^^^^^ help: consider using: `f(); let c: std::vec::Vec<i32> = vec![];`
31+
| ^^^^^^^^^^^^^^^^^^^^^
32+
|
33+
help: consider performing the side effect separately
34+
|
35+
LL - let c = vec![f(); 0];
36+
LL + f(); let c: std::vec::Vec<i32> = vec![];
37+
|
2138

2239
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
23-
--> tests/ui/zero_repeat_side_effects.rs:29:5
40+
--> tests/ui/zero_repeat_side_effects.rs:27:5
2441
|
2542
LL | d = vec![f(); 0];
26-
| ^^^^^^^^^^^^^^^^ help: consider using: `f(); d = vec![] as std::vec::Vec<i32>`
43+
| ^^^^^^^^^^^^^^^^
44+
|
45+
help: consider performing the side effect separately
46+
|
47+
LL - d = vec![f(); 0];
48+
LL + f(); d = vec![] as std::vec::Vec<i32>;
49+
|
2750

2851
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
29-
--> tests/ui/zero_repeat_side_effects.rs:33:5
52+
--> tests/ui/zero_repeat_side_effects.rs:31:5
3053
|
3154
LL | let e = [println!("side effect"); 0];
32-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `println!("side effect"); let e: [(); 0] = [];`
55+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
56+
|
57+
help: consider performing the side effect separately
58+
|
59+
LL - let e = [println!("side effect"); 0];
60+
LL + println!("side effect"); let e: [(); 0] = [];
61+
|
3362

3463
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
35-
--> tests/ui/zero_repeat_side_effects.rs:37:5
64+
--> tests/ui/zero_repeat_side_effects.rs:35:5
3665
|
3766
LL | let g = [{ f() }; 0];
38-
| ^^^^^^^^^^^^^^^^^^^^^ help: consider using: `{ f() }; let g: [i32; 0] = [];`
67+
| ^^^^^^^^^^^^^^^^^^^^^
68+
|
69+
help: consider performing the side effect separately
70+
|
71+
LL - let g = [{ f() }; 0];
72+
LL + { f() }; let g: [i32; 0] = [];
73+
|
3974

4075
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
41-
--> tests/ui/zero_repeat_side_effects.rs:41:10
76+
--> tests/ui/zero_repeat_side_effects.rs:39:10
4277
|
4378
LL | drop(vec![f(); 0]);
44-
| ^^^^^^^^^^^^ help: consider using: `{ f(); vec![] as std::vec::Vec<i32> }`
79+
| ^^^^^^^^^^^^
80+
|
81+
help: consider performing the side effect separately
82+
|
83+
LL - drop(vec![f(); 0]);
84+
LL + drop({ f(); vec![] as std::vec::Vec<i32> });
85+
|
4586

4687
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
47-
--> tests/ui/zero_repeat_side_effects.rs:45:5
88+
--> tests/ui/zero_repeat_side_effects.rs:43:5
4889
|
4990
LL | vec![f(); 0];
50-
| ^^^^^^^^^^^^ help: consider using: `{ f(); vec![] as std::vec::Vec<i32> }`
91+
| ^^^^^^^^^^^^
92+
|
93+
help: consider performing the side effect separately
94+
|
95+
LL - vec![f(); 0];
96+
LL + { f(); vec![] as std::vec::Vec<i32> };
97+
|
5198

5299
error: function or method calls as the initial value in zero-sized array initializers may cause side effects
53-
--> tests/ui/zero_repeat_side_effects.rs:47:5
100+
--> tests/ui/zero_repeat_side_effects.rs:45:5
54101
|
55102
LL | [f(); 0];
56-
| ^^^^^^^^ help: consider using: `{ f(); [] as [i32; 0] }`
103+
| ^^^^^^^^
104+
|
105+
help: consider performing the side effect separately
106+
|
107+
LL - [f(); 0];
108+
LL + { f(); [] as [i32; 0] };
109+
|
57110

58111
error: aborting due to 9 previous errors
59112

0 commit comments

Comments
 (0)