nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-12 16:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #11284 - lengyijun:reorder, r=blyxyas

Browse Source 
Alphabetically order arms in `methods/mod.rs` match

changelog: none

just order the arms in the match block
This commit is contained in:
bors 2023-08-02 11:45:32 +00:00
commit 78f5e0d3ec
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clippy_lints/src/methods/mod.rs
View File

@ -3881,6 +3881,13 @@ impl Methods {
unnecessary_lazy_eval::check(cx, expr, recv, arg, "and"); unnecessary_lazy_eval::check(cx, expr, recv, arg, "and");
} }
}, },
("any", [arg]) if let ExprKind::Closure(arg) = arg.kind
&& let body = cx.tcx.hir().body(arg.body)
&& let [param] = body.params
&& let Some(("chars", recv, _, _, _)) = method_call(recv) =>
{
string_lit_chars_any::check(cx, expr, recv, param, peel_blocks(body.value), &self.msrv);
}
("arg", [arg]) => { ("arg", [arg]) => {
suspicious_command_arg_space::check(cx, recv, arg, span); suspicious_command_arg_space::check(cx, recv, arg, span);
} }
@ -3999,15 +4006,6 @@ impl Methods {
unnecessary_join::check(cx, expr, recv, join_arg, span); unnecessary_join::check(cx, expr, recv, join_arg, span);
} }
}, },
("skip", [arg]) => {
iter_skip_zero::check(cx, expr, arg);
if let Some((name2, recv2, args2, _span2, _)) = method_call(recv) {
if let ("cloned", []) = (name2, args2) {
iter_overeager_cloned::check(cx, expr, recv, recv2, false, false);
}
}
}
("last", []) => { ("last", []) => {
if let Some((name2, recv2, args2, _span2, _)) = method_call(recv) { if let Some((name2, recv2, args2, _span2, _)) = method_call(recv) {
if let ("cloned", []) = (name2, args2) { if let ("cloned", []) = (name2, args2) {
@ -4060,13 +4058,6 @@ impl Methods {
} }
} }
}, },
("any", [arg]) if let ExprKind::Closure(arg) = arg.kind
&& let body = cx.tcx.hir().body(arg.body)
&& let [param] = body.params
&& let Some(("chars", recv, _, _, _)) = method_call(recv) =>
{
string_lit_chars_any::check(cx, expr, recv, param, peel_blocks(body.value), &self.msrv);
}
("nth", [n_arg]) => match method_call(recv) { ("nth", [n_arg]) => match method_call(recv) {
Some(("bytes", recv2, [], _, _)) => bytes_nth::check(cx, expr, recv2, n_arg), Some(("bytes", recv2, [], _, _)) => bytes_nth::check(cx, expr, recv2, n_arg),
Some(("cloned", recv2, [], _, _)) => iter_overeager_cloned::check(cx, expr, recv, recv2, false, false), Some(("cloned", recv2, [], _, _)) => iter_overeager_cloned::check(cx, expr, recv, recv2, false, false),
@ -4120,6 +4111,15 @@ impl Methods {
seek_to_start_instead_of_rewind::check(cx, expr, recv, arg, span); seek_to_start_instead_of_rewind::check(cx, expr, recv, arg, span);
} }
}, },
("skip", [arg]) => {
iter_skip_zero::check(cx, expr, arg);
if let Some((name2, recv2, args2, _span2, _)) = method_call(recv) {
if let ("cloned", []) = (name2, args2) {
iter_overeager_cloned::check(cx, expr, recv, recv2, false, false);
}
}
}
("sort", []) => { ("sort", []) => {
stable_sort_primitive::check(cx, expr, recv); stable_sort_primitive::check(cx, expr, recv);
}, },
@ -4214,6 +4214,9 @@ impl Methods {
} }
unnecessary_literal_unwrap::check(cx, expr, recv, name, args); unnecessary_literal_unwrap::check(cx, expr, recv, name, args);
}, },
("write", []) => {
readonly_write_lock::check(cx, expr, recv);
}
("zip", [arg]) => { ("zip", [arg]) => {
if let ExprKind::MethodCall(name, iter_recv, [], _) = recv.kind if let ExprKind::MethodCall(name, iter_recv, [], _) = recv.kind
&& name.ident.name == sym::iter && name.ident.name == sym::iter
@ -4221,9 +4224,6 @@ impl Methods {
range_zip_with_len::check(cx, expr, iter_recv, arg); range_zip_with_len::check(cx, expr, iter_recv, arg);
} }
}, },
("write", []) => {
readonly_write_lock::check(cx, expr, recv);
}
_ => {}, _ => {},
} }
} }