mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #11899 - samueltardieu:redundant-if, r=llogiq

Browse Source 
Do not check twice whether `qpath` is a `QPath::TypeRelative` variant

This is a style fix: the outer `if` check was useless.

changelog: none
This commit is contained in:
bors 2023-12-02 14:33:24 +00:00
commit 31aa0b2bbe
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clippy_lints/src/manual_string_new.rs
View File

@ -108,18 +108,16 @@ fn parse_call(cx: &LateContext<'_>, span: Span, func: &Expr<'_>, args: &[Expr<'_
let arg_kind = &args[0].kind; let arg_kind = &args[0].kind;
if let ExprKind::Path(qpath) = &func.kind { if let ExprKind::Path(qpath) = &func.kind {
if let QPath::TypeRelative(_, _) = qpath { // String::from(...) or String::try_from(...)
// String::from(...) or String::try_from(...) if let QPath::TypeRelative(ty, path_seg) = qpath
if let QPath::TypeRelative(ty, path_seg) = qpath && [sym::from, sym::try_from].contains(&path_seg.ident.name)
&& [sym::from, sym::try_from].contains(&path_seg.ident.name) && let TyKind::Path(qpath) = &ty.kind
&& let TyKind::Path(qpath) = &ty.kind && let QPath::Resolved(_, path) = qpath
&& let QPath::Resolved(_, path) = qpath && let [path_seg] = path.segments
&& let [path_seg] = path.segments && path_seg.ident.name == sym::String
&& path_seg.ident.name == sym::String && is_expr_kind_empty_str(arg_kind)
&& is_expr_kind_empty_str(arg_kind) {
{ warn_then_suggest(cx, span);
warn_then_suggest(cx, span);
}
} else if let QPath::Resolved(_, path) = qpath { } else if let QPath::Resolved(_, path) = qpath {
// From::from(...) or TryFrom::try_from(...) // From::from(...) or TryFrom::try_from(...)
if let [path_seg1, path_seg2] = path.segments if let [path_seg1, path_seg2] = path.segments