Skip to content

Commit 78f5e0d

Browse files
committed
Auto merge of #11284 - lengyijun:reorder, r=blyxyas
Alphabetically order arms in `methods/mod.rs` match changelog: none just order the arms in the match block
2 parents 588c1ab + 72074a0 commit 78f5e0d

File tree

1 file changed

+19
-19
lines changed
  • clippy_lints/src/methods

1 file changed

+19
-19
lines changed

clippy_lints/src/methods/mod.rs

+19-19
Original file line numberDiff line numberDiff line change
@@ -3881,6 +3881,13 @@ impl Methods {
38813881
unnecessary_lazy_eval::check(cx, expr, recv, arg, "and");
38823882
}
38833883
},
3884+
("any", [arg]) if let ExprKind::Closure(arg) = arg.kind
3885+
&& let body = cx.tcx.hir().body(arg.body)
3886+
&& let [param] = body.params
3887+
&& let Some(("chars", recv, _, _, _)) = method_call(recv) =>
3888+
{
3889+
string_lit_chars_any::check(cx, expr, recv, param, peel_blocks(body.value), &self.msrv);
3890+
}
38843891
("arg", [arg]) => {
38853892
suspicious_command_arg_space::check(cx, recv, arg, span);
38863893
}
@@ -3999,15 +4006,6 @@ impl Methods {
39994006
unnecessary_join::check(cx, expr, recv, join_arg, span);
40004007
}
40014008
},
4002-
("skip", [arg]) => {
4003-
iter_skip_zero::check(cx, expr, arg);
4004-
4005-
if let Some((name2, recv2, args2, _span2, _)) = method_call(recv) {
4006-
if let ("cloned", []) = (name2, args2) {
4007-
iter_overeager_cloned::check(cx, expr, recv, recv2, false, false);
4008-
}
4009-
}
4010-
}
40114009
("last", []) => {
40124010
if let Some((name2, recv2, args2, _span2, _)) = method_call(recv) {
40134011
if let ("cloned", []) = (name2, args2) {
@@ -4060,13 +4058,6 @@ impl Methods {
40604058
}
40614059
}
40624060
},
4063-
("any", [arg]) if let ExprKind::Closure(arg) = arg.kind
4064-
&& let body = cx.tcx.hir().body(arg.body)
4065-
&& let [param] = body.params
4066-
&& let Some(("chars", recv, _, _, _)) = method_call(recv) =>
4067-
{
4068-
string_lit_chars_any::check(cx, expr, recv, param, peel_blocks(body.value), &self.msrv);
4069-
}
40704061
("nth", [n_arg]) => match method_call(recv) {
40714062
Some(("bytes", recv2, [], _, _)) => bytes_nth::check(cx, expr, recv2, n_arg),
40724063
Some(("cloned", recv2, [], _, _)) => iter_overeager_cloned::check(cx, expr, recv, recv2, false, false),
@@ -4120,6 +4111,15 @@ impl Methods {
41204111
seek_to_start_instead_of_rewind::check(cx, expr, recv, arg, span);
41214112
}
41224113
},
4114+
("skip", [arg]) => {
4115+
iter_skip_zero::check(cx, expr, arg);
4116+
4117+
if let Some((name2, recv2, args2, _span2, _)) = method_call(recv) {
4118+
if let ("cloned", []) = (name2, args2) {
4119+
iter_overeager_cloned::check(cx, expr, recv, recv2, false, false);
4120+
}
4121+
}
4122+
}
41234123
("sort", []) => {
41244124
stable_sort_primitive::check(cx, expr, recv);
41254125
},
@@ -4214,16 +4214,16 @@ impl Methods {
42144214
}
42154215
unnecessary_literal_unwrap::check(cx, expr, recv, name, args);
42164216
},
4217+
("write", []) => {
4218+
readonly_write_lock::check(cx, expr, recv);
4219+
}
42174220
("zip", [arg]) => {
42184221
if let ExprKind::MethodCall(name, iter_recv, [], _) = recv.kind
42194222
&& name.ident.name == sym::iter
42204223
{
42214224
range_zip_with_len::check(cx, expr, iter_recv, arg);
42224225
}
42234226
},
4224-
("write", []) => {
4225-
readonly_write_lock::check(cx, expr, recv);
4226-
}
42274227
_ => {},
42284228
}
42294229
}

0 commit comments

Comments
 (0)