nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-05 03:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Appease the clippy

Browse Source
This commit is contained in:
Michael Goulet 2023-11-23 06:17:43 +00:00
parent fa7633dda1
commit 4e23448c49
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/clippy/clippy_lints/src/methods/clone_on_copy.rs
View File

@ -61,7 +61,7 @@ pub(super) fn check(
// ? is a Call, makes sure not to rec *x?, but rather (*x)? // ? is a Call, makes sure not to rec *x?, but rather (*x)?
ExprKind::Call(hir_callee, _) => matches!( ExprKind::Call(hir_callee, _) => matches!(
hir_callee.kind, hir_callee.kind,
ExprKind::Path(QPath::LangItem(rustc_hir::LangItem::TryTraitBranch, _, _)) ExprKind::Path(QPath::LangItem(rustc_hir::LangItem::TryTraitBranch, ..))
), ),
ExprKind::MethodCall(_, self_arg, ..) if expr.hir_id == self_arg.hir_id => true, ExprKind::MethodCall(_, self_arg, ..) if expr.hir_id == self_arg.hir_id => true,
ExprKind::Match(_, _, MatchSource::TryDesugar(_) | MatchSource::AwaitDesugar) ExprKind::Match(_, _, MatchSource::TryDesugar(_) | MatchSource::AwaitDesugar)

2
src/tools/clippy/clippy_lints/src/returns.rs
View File

@ -309,7 +309,7 @@ fn check_final_expr<'tcx>(
let replacement = if let Some(inner_expr) = inner { let replacement = if let Some(inner_expr) = inner {
// if desugar of `do yeet`, don't lint // if desugar of `do yeet`, don't lint
if let ExprKind::Call(path_expr, _) = inner_expr.kind if let ExprKind::Call(path_expr, _) = inner_expr.kind
&& let ExprKind::Path(QPath::LangItem(LangItem::TryTraitFromYeet, _, _)) = path_expr.kind && let ExprKind::Path(QPath::LangItem(LangItem::TryTraitFromYeet, ..)) = path_expr.kind
{ {
return; return;
} }

2
src/tools/clippy/clippy_lints/src/unnecessary_map_on_constructor.rs
View File

@ -59,7 +59,7 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryMapOnConstructor {
} }
}, },
hir::QPath::TypeRelative(_, path) => path.ident.name, hir::QPath::TypeRelative(_, path) => path.ident.name,
hir::QPath::LangItem(_, _, _) => return, hir::QPath::LangItem(..) => return,
}; };
match constructor_symbol { match constructor_symbol {
sym::Some | sym::Ok if path.ident.name == rustc_span::sym::map => (), sym::Some | sym::Ok if path.ident.name == rustc_span::sym::map => (),

2
src/tools/clippy/clippy_utils/src/ty/type_certainty/mod.rs
View File

@ -170,7 +170,7 @@ fn qpath_certainty(cx: &LateContext<'_>, qpath: &QPath<'_>, resolves_to_type: bo
path_segment_certainty(cx, type_certainty(cx, ty), path_segment, resolves_to_type) path_segment_certainty(cx, type_certainty(cx, ty), path_segment, resolves_to_type)
}, },
QPath::LangItem(lang_item, _, _) => { QPath::LangItem(lang_item, ..) => {
cx.tcx cx.tcx
.lang_items() .lang_items()
.get(*lang_item) .get(*lang_item)