diff options
| author | bors <bors@rust-lang.org> | 2024-04-23 04:13:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-23 04:13:33 +0000 |
| commit | 9ca9d710bfb47871791727a8313e01852b21d51b (patch) | |
| tree | 7ade706e94aea73397c64b7280372e100d6ce4bd /clippy_lints | |
| parent | a5aaf33422f110d7a4ca6ba53fc5f2995dd6b0ce (diff) | |
| parent | 81106c5691bc05136a5ce679d94ac31b682769ed (diff) | |
| download | rust-9ca9d710bfb47871791727a8313e01852b21d51b.tar.gz rust-9ca9d710bfb47871791727a8313e01852b21d51b.zip | |
Auto merge of #123992 - compiler-errors:no-has-typeck-results, r=jackh726
`has_typeck_results` doesnt need to be a query self-explanatory
Diffstat (limited to 'clippy_lints')
| -rw-r--r-- | clippy_lints/src/functions/must_use.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/functions/must_use.rs b/clippy_lints/src/functions/must_use.rs index d0c66900c00..e7ec2b3151e 100644 --- a/clippy_lints/src/functions/must_use.rs +++ b/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) { |