Skip to content

Commit 363c08a

Browse files
m-ou-sem-ou-se
committed
Bless clippy tests.
1 parent 8d37cb7 commit 363c08a

File tree

5 files changed

+80
-61
lines changed

5 files changed

+80
-61
lines changed

‎src/tools/clippy/tests/ui/author/macro_in_closure.stdout

+40-21
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,51 @@ if let StmtKind::Let(local) = stmt.kind
1010
&& let ExprKind::Path(ref qpath) = func.kind
1111
&& match_qpath(qpath, &["$crate", "io", "_print"])
1212
&& args.len() == 1
13-
&& let ExprKind::Call(func1, args1) = args[0].kind
14-
&& let ExprKind::Path(ref qpath1) = func1.kind
15-
&& match_qpath(qpath1, &["format_arguments", "new_v1"])
16-
&& args1.len() == 2
17-
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner) = args1[0].kind
18-
&& let ExprKind::Array(elements) = inner.kind
19-
&& elements.len() == 2
20-
&& let ExprKind::Lit(ref lit) = elements[0].kind
13+
&& let ExprKind::Block(block1, None) = args[0].kind
14+
&& block1.stmts.len() == 2
15+
&& let StmtKind::Let(local1) = block1.stmts[0].kind
16+
&& let Some(init1) = local1.init
17+
&& let ExprKind::Tup(elements) = init1.kind
18+
&& elements.len() == 1
19+
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner) = elements[0].kind
20+
&& let ExprKind::Path(ref qpath1) = inner.kind
21+
&& match_qpath(qpath1, &["x"])
22+
&& let PatKind::Binding(BindingMode::NONE, _, name, None) = local1.pat.kind
23+
&& name.as_str() == "args"
24+
&& let StmtKind::Let(local2) = block1.stmts[1].kind
25+
&& let Some(init2) = local2.init
26+
&& let ExprKind::Array(elements1) = init2.kind
27+
&& elements1.len() == 1
28+
&& let ExprKind::Call(func1, args1) = elements1[0].kind
29+
&& let ExprKind::Path(ref qpath2) = func1.kind
30+
&& match_qpath(qpath2, &["format_argument", "new_display"])
31+
&& args1.len() == 1
32+
&& let ExprKind::Field(object, field_name) = args1[0].kind
33+
&& field_name.as_str() == "0"
34+
&& let ExprKind::Path(ref qpath3) = object.kind
35+
&& match_qpath(qpath3, &["args"])
36+
&& let PatKind::Binding(BindingMode::NONE, _, name1, None) = local2.pat.kind
37+
&& name1.as_str() == "args"
38+
&& let Some(trailing_expr) = block1.expr
39+
&& let ExprKind::Call(func2, args2) = trailing_expr.kind
40+
&& let ExprKind::Path(ref qpath4) = func2.kind
41+
&& match_qpath(qpath4, &["format_arguments", "new_v1"])
42+
&& args2.len() == 2
43+
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner1) = args2[0].kind
44+
&& let ExprKind::Array(elements2) = inner1.kind
45+
&& elements2.len() == 2
46+
&& let ExprKind::Lit(ref lit) = elements2[0].kind
2147
&& let LitKind::Str(s, _) = lit.node
2248
&& s.as_str() == ""
23-
&& let ExprKind::Lit(ref lit1) = elements[1].kind
49+
&& let ExprKind::Lit(ref lit1) = elements2[1].kind
2450
&& let LitKind::Str(s1, _) = lit1.node
2551
&& s1.as_str() == "\n"
26-
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner1) = args1[1].kind
27-
&& let ExprKind::Array(elements1) = inner1.kind
28-
&& elements1.len() == 1
29-
&& let ExprKind::Call(func2, args2) = elements1[0].kind
30-
&& let ExprKind::Path(ref qpath2) = func2.kind
31-
&& match_qpath(qpath2, &["format_argument", "new_display"])
32-
&& args2.len() == 1
33-
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner2) = args2[0].kind
34-
&& let ExprKind::Path(ref qpath3) = inner2.kind
35-
&& match_qpath(qpath3, &["x"])
52+
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner2) = args2[1].kind
53+
&& let ExprKind::Path(ref qpath5) = inner2.kind
54+
&& match_qpath(qpath5, &["args"])
3655
&& block.expr.is_none()
37-
&& let PatKind::Binding(BindingMode::NONE, _, name, None) = local.pat.kind
38-
&& name.as_str() == "print_text"
56+
&& let PatKind::Binding(BindingMode::NONE, _, name2, None) = local.pat.kind
57+
&& name2.as_str() == "print_text"
3958
{
4059
// report your lint here
4160
}

‎src/tools/clippy/tests/ui/author/macro_in_loop.stdout

+38-19
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,48 @@ if let Some(higher::ForLoop { pat: pat, arg: arg, body: body, .. }) = higher::Fo
2020
&& let ExprKind::Path(ref qpath1) = func.kind
2121
&& match_qpath(qpath1, &["$crate", "io", "_print"])
2222
&& args.len() == 1
23-
&& let ExprKind::Call(func1, args1) = args[0].kind
24-
&& let ExprKind::Path(ref qpath2) = func1.kind
25-
&& match_qpath(qpath2, &["format_arguments", "new_v1"])
26-
&& args1.len() == 2
27-
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner) = args1[0].kind
28-
&& let ExprKind::Array(elements) = inner.kind
29-
&& elements.len() == 2
30-
&& let ExprKind::Lit(ref lit2) = elements[0].kind
23+
&& let ExprKind::Block(block2, None) = args[0].kind
24+
&& block2.stmts.len() == 2
25+
&& let StmtKind::Let(local) = block2.stmts[0].kind
26+
&& let Some(init) = local.init
27+
&& let ExprKind::Tup(elements) = init.kind
28+
&& elements.len() == 1
29+
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner) = elements[0].kind
30+
&& let ExprKind::Path(ref qpath2) = inner.kind
31+
&& match_qpath(qpath2, &["i"])
32+
&& let PatKind::Binding(BindingMode::NONE, _, name1, None) = local.pat.kind
33+
&& name1.as_str() == "args"
34+
&& let StmtKind::Let(local1) = block2.stmts[1].kind
35+
&& let Some(init1) = local1.init
36+
&& let ExprKind::Array(elements1) = init1.kind
37+
&& elements1.len() == 1
38+
&& let ExprKind::Call(func1, args1) = elements1[0].kind
39+
&& let ExprKind::Path(ref qpath3) = func1.kind
40+
&& match_qpath(qpath3, &["format_argument", "new_display"])
41+
&& args1.len() == 1
42+
&& let ExprKind::Field(object, field_name) = args1[0].kind
43+
&& field_name.as_str() == "0"
44+
&& let ExprKind::Path(ref qpath4) = object.kind
45+
&& match_qpath(qpath4, &["args"])
46+
&& let PatKind::Binding(BindingMode::NONE, _, name2, None) = local1.pat.kind
47+
&& name2.as_str() == "args"
48+
&& let Some(trailing_expr) = block2.expr
49+
&& let ExprKind::Call(func2, args2) = trailing_expr.kind
50+
&& let ExprKind::Path(ref qpath5) = func2.kind
51+
&& match_qpath(qpath5, &["format_arguments", "new_v1"])
52+
&& args2.len() == 2
53+
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner1) = args2[0].kind
54+
&& let ExprKind::Array(elements2) = inner1.kind
55+
&& elements2.len() == 2
56+
&& let ExprKind::Lit(ref lit2) = elements2[0].kind
3157
&& let LitKind::Str(s, _) = lit2.node
3258
&& s.as_str() == ""
33-
&& let ExprKind::Lit(ref lit3) = elements[1].kind
59+
&& let ExprKind::Lit(ref lit3) = elements2[1].kind
3460
&& let LitKind::Str(s1, _) = lit3.node
3561
&& s1.as_str() == "\n"
36-
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner1) = args1[1].kind
37-
&& let ExprKind::Array(elements1) = inner1.kind
38-
&& elements1.len() == 1
39-
&& let ExprKind::Call(func2, args2) = elements1[0].kind
40-
&& let ExprKind::Path(ref qpath3) = func2.kind
41-
&& match_qpath(qpath3, &["format_argument", "new_display"])
42-
&& args2.len() == 1
43-
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner2) = args2[0].kind
44-
&& let ExprKind::Path(ref qpath4) = inner2.kind
45-
&& match_qpath(qpath4, &["i"])
62+
&& let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner2) = args2[1].kind
63+
&& let ExprKind::Path(ref qpath6) = inner2.kind
64+
&& match_qpath(qpath6, &["args"])
4665
&& block1.expr.is_none()
4766
&& block.expr.is_none()
4867
{

‎src/tools/clippy/tests/ui/manual_inspect.fixed

-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ fn main() {
154154
});
155155

156156
let _ = [0]
157-
//~^ suspicious_map
158157
.into_iter()
159158
.inspect(|&x| {
160159
//~^ manual_inspect

‎src/tools/clippy/tests/ui/manual_inspect.rs

-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ fn main() {
165165
});
166166

167167
let _ = [0]
168-
//~^ suspicious_map
169168
.into_iter()
170169
.map(|x| {
171170
//~^ manual_inspect

‎src/tools/clippy/tests/ui/manual_inspect.stderr

+2-19
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,8 @@ LL |
157157
LL ~ println!("{}", x);
158158
|
159159

160-
error: this call to `map()` won't have an effect on the call to `count()`
161-
--> tests/ui/manual_inspect.rs:167:13
162-
|
163-
LL | let _ = [0]
164-
| _____________^
165-
LL | |
166-
LL | | .into_iter()
167-
LL | | .map(|x| {
168-
... |
169-
LL | | })
170-
LL | | .count();
171-
| |________________^
172-
|
173-
= help: make sure you did not confuse `map` with `filter`, `for_each` or `inspect`
174-
= note: `-D clippy::suspicious-map` implied by `-D warnings`
175-
= help: to override `-D warnings` add `#[allow(clippy::suspicious_map)]`
176-
177160
error: using `map` over `inspect`
178-
--> tests/ui/manual_inspect.rs:170:10
161+
--> tests/ui/manual_inspect.rs:169:10
179162
|
180163
LL | .map(|x| {
181164
| ^^^
@@ -187,5 +170,5 @@ LL |
187170
LL ~ println!("{}", x);
188171
|
189172

190-
error: aborting due to 13 previous errors
173+
error: aborting due to 12 previous errors
191174

0 commit comments

Comments
 (0)