diff options
| author | Michael Goulet <michael@errs.io> | 2024-04-15 18:56:44 -0400 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2024-04-17 22:18:27 -0400 |
| commit | 6abf1aae2438520780ef463db4c0cbdccc7ca4eb (patch) | |
| tree | 9b88e70834d0911b3df5bc1fe972fb499a010b18 /src | |
| parent | 9f432d7b44d5c4ac0ce76fed8315ffac8dcab8f9 (diff) | |
| download | rust-6abf1aae2438520780ef463db4c0cbdccc7ca4eb.tar.gz rust-6abf1aae2438520780ef463db4c0cbdccc7ca4eb.zip | |
has_typeck_results doesnt need to be a query
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/functions/must_use.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/clippy/clippy_lints/src/functions/must_use.rs b/src/tools/clippy/clippy_lints/src/functions/must_use.rs index d0c66900c00..e7ec2b3151e 100644 --- a/src/tools/clippy/clippy_lints/src/functions/must_use.rs +++ b/src/tools/clippy/clippy_lints/src/functions/must_use.rs @@ -185,7 +185,7 @@ fn is_mutable_pat(cx: &LateContext<'_>, pat: &hir::Pat<'_>, tys: &mut DefIdSet) if let hir::PatKind::Wild = pat.kind { return false; // ignore `_` patterns } - if cx.tcx.has_typeck_results(pat.hir_id.owner.to_def_id()) { + if cx.tcx.has_typeck_results(pat.hir_id.owner.def_id) { is_mutable_ty(cx, cx.tcx.typeck(pat.hir_id.owner.def_id).pat_ty(pat), tys) } else { false @@ -233,7 +233,7 @@ fn mutates_static<'tcx>(cx: &LateContext<'tcx>, body: &'tcx hir::Body<'_>) -> bo Call(_, args) => { let mut tys = DefIdSet::default(); for arg in args { - if cx.tcx.has_typeck_results(arg.hir_id.owner.to_def_id()) + if cx.tcx.has_typeck_results(arg.hir_id.owner.def_id) && is_mutable_ty(cx, cx.tcx.typeck(arg.hir_id.owner.def_id).expr_ty(arg), &mut tys) && is_mutated_static(arg) { @@ -246,7 +246,7 @@ fn mutates_static<'tcx>(cx: &LateContext<'tcx>, body: &'tcx hir::Body<'_>) -> bo MethodCall(_, receiver, args, _) => { let mut tys = DefIdSet::default(); for arg in std::iter::once(receiver).chain(args.iter()) { - if cx.tcx.has_typeck_results(arg.hir_id.owner.to_def_id()) + if cx.tcx.has_typeck_results(arg.hir_id.owner.def_id) && is_mutable_ty(cx, cx.tcx.typeck(arg.hir_id.owner.def_id).expr_ty(arg), &mut tys) && is_mutated_static(arg) { |