Skip to content

Commit 8d8ba14

Browse files
committed
Fix author lint
1 parent 4bbd10a commit 8d8ba14

File tree

9 files changed

+43
-81
lines changed

9 files changed

+43
-81
lines changed

clippy_lints/src/utils/author.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ declare_clippy_lint! {
3838
/// if let ExprKind::Binary(BinOp::Eq, ref left, ref right) = cond.kind,
3939
/// if let ExprKind::Path(ref path) = left.kind,
4040
/// if let ExprKind::Lit(ref lit) = right.kind,
41-
/// if let LitKind::Int(42, _) = lit.kind,
41+
/// if let LitKind::Int(42, _) = lit.node,
4242
/// then {
4343
/// // report your lint here
4444
/// }
@@ -401,7 +401,7 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor {
401401
let obj_pat = self.next("object");
402402
let field_name_pat = self.next("field_name");
403403
println!("Field(ref {}, ref {}) = {};", obj_pat, field_name_pat, current);
404-
println!(" if {}.kind.as_str() == {:?}", field_name_pat, field_ident.as_str());
404+
println!(" if {}.as_str() == {:?}", field_name_pat, field_ident.as_str());
405405
self.current = obj_pat;
406406
self.visit_expr(object);
407407
},
@@ -532,7 +532,7 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor {
532532
} else {
533533
println!("Binding({}, _, {}, None) = {};", anno_pat, name_pat, current);
534534
}
535-
println!(" if {}.kind.as_str() == \"{}\";", name_pat, ident.as_str());
535+
println!(" if {}.as_str() == \"{}\";", name_pat, ident.as_str());
536536
},
537537
PatKind::Struct(ref path, ref fields, ignore) => {
538538
let path_pat = self.next("path");

tests/ui/author.stdout

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if_chain! {
77
if let ExprKind::Lit(ref lit) = expr.kind;
88
if let LitKind::Int(69, _) = lit.node;
99
if let PatKind::Binding(BindingAnnotation::Unannotated, _, name, None) = local.pat.kind;
10-
if name.kind.as_str() == "x";
10+
if name.as_str() == "x";
1111
then {
1212
// report your lint here
1313
}

tests/ui/author/blocks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(stmt_expr_attributes)]
2-
#![allow(redundant_semicolon)]
2+
#![allow(redundant_semicolon, clippy::no_effect)]
33

44
#[rustfmt::skip]
55
fn main() {

tests/ui/author/blocks.stderr

-16
This file was deleted.

tests/ui/author/for_loop.stdout

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if_chain! {
1515
if body.stmts.len() == 4;
1616
if let StmtKind::Local(ref local) = body.stmts[0].kind;
1717
if let PatKind::Binding(BindingAnnotation::Mutable, _, name, None) = local.pat.kind;
18-
if name.kind.as_str() == "__next";
18+
if name.as_str() == "__next";
1919
if let StmtKind::Expr(ref e, _) = body.stmts[1].kind
2020
if let ExprKind::Match(ref expr2, ref arms1, MatchSource::ForLoopDesugar) = e.kind;
2121
if let ExprKind::Call(ref func1, ref args1) = expr2.kind;
@@ -43,7 +43,7 @@ if_chain! {
4343
if let ExprKind::Path(ref path8) = init.kind;
4444
if match_qpath(path8, &["__next"]);
4545
if let PatKind::Binding(BindingAnnotation::Unannotated, _, name1, None) = local1.pat.kind;
46-
if name1.kind.as_str() == "y";
46+
if name1.as_str() == "y";
4747
if let StmtKind::Expr(ref e1, _) = body.stmts[3].kind
4848
if let ExprKind::Block(ref block) = e1.kind;
4949
if let Some(trailing_expr1) = &block.expr;
@@ -53,9 +53,9 @@ if_chain! {
5353
if let ExprKind::Path(ref path9) = init1.kind;
5454
if match_qpath(path9, &["y"]);
5555
if let PatKind::Binding(BindingAnnotation::Unannotated, _, name2, None) = local2.pat.kind;
56-
if name2.kind.as_str() == "z";
56+
if name2.as_str() == "z";
5757
if let PatKind::Binding(BindingAnnotation::Mutable, _, name3, None) = arms[0].pat.kind;
58-
if name3.kind.as_str() == "iter";
58+
if name3.as_str() == "iter";
5959
then {
6060
// report your lint here
6161
}

tests/ui/author/matches.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(tool_attributes)]
1+
#![allow(clippy::let_and_return)]
22

33
fn main() {
44
#[clippy::author]

tests/ui/author/matches.stderr

-17
This file was deleted.

tests/ui/author/matches.stdout

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
if_chain! {
2+
if let StmtKind::Local(ref local) = stmt.kind;
3+
if let Some(ref init) = local.init;
4+
if let ExprKind::Match(ref expr, ref arms, MatchSource::Normal) = init.kind;
5+
if let ExprKind::Lit(ref lit) = expr.kind;
6+
if let LitKind::Int(42, _) = lit.node;
7+
if arms.len() == 3;
8+
if let ExprKind::Lit(ref lit1) = arms[0].body.kind;
9+
if let LitKind::Int(5, _) = lit1.node;
10+
if let PatKind::Lit(ref lit_expr) = arms[0].pat.kind
11+
if let ExprKind::Lit(ref lit2) = lit_expr.kind;
12+
if let LitKind::Int(16, _) = lit2.node;
13+
if let ExprKind::Block(ref block) = arms[1].body.kind;
14+
if let Some(trailing_expr) = &block.expr;
15+
if block.stmts.len() == 1;
16+
if let StmtKind::Local(ref local1) = block.stmts[0].kind;
17+
if let Some(ref init1) = local1.init;
18+
if let ExprKind::Lit(ref lit3) = init1.kind;
19+
if let LitKind::Int(3, _) = lit3.node;
20+
if let PatKind::Binding(BindingAnnotation::Unannotated, _, name, None) = local1.pat.kind;
21+
if name.as_str() == "x";
22+
if let PatKind::Lit(ref lit_expr1) = arms[1].pat.kind
23+
if let ExprKind::Lit(ref lit4) = lit_expr1.kind;
24+
if let LitKind::Int(17, _) = lit4.node;
25+
if let ExprKind::Lit(ref lit5) = arms[2].body.kind;
26+
if let LitKind::Int(1, _) = lit5.node;
27+
if let PatKind::Wild = arms[2].pat.kind;
28+
if let PatKind::Binding(BindingAnnotation::Unannotated, _, name1, None) = local.pat.kind;
29+
if name1.as_str() == "a";
30+
then {
31+
// report your lint here
32+
}
33+
}

tests/ui/author/matches.stout

-38
This file was deleted.

0 commit comments

Comments
 (0)