From aa6f45eb79113e2ecd81646f33d113e7727a27e6 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Thu, 8 Feb 2024 09:30:42 +0000 Subject: [PATCH] Use `ensure` when the result of the query is not needed beyond its `Result`ness --- compiler/rustc_hir_typeck/src/callee.rs | 2 +- compiler/rustc_trait_selection/src/traits/specialize/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_hir_typeck/src/callee.rs b/compiler/rustc_hir_typeck/src/callee.rs index 1cd4b4cc4fc62..9217c2db360cd 100644 --- a/compiler/rustc_hir_typeck/src/callee.rs +++ b/compiler/rustc_hir_typeck/src/callee.rs @@ -53,7 +53,7 @@ pub fn check_legal_trait_for_method_call( }; return Err(tcx.dcx().emit_err(errors::ExplicitDestructorCall { span, sugg })); } - tcx.coherent_trait(trait_id) + tcx.ensure().coherent_trait(trait_id) } #[derive(Debug)] diff --git a/compiler/rustc_trait_selection/src/traits/specialize/mod.rs b/compiler/rustc_trait_selection/src/traits/specialize/mod.rs index de08e7d2f0384..8e0fa79c97748 100644 --- a/compiler/rustc_trait_selection/src/traits/specialize/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/specialize/mod.rs @@ -446,7 +446,7 @@ fn report_conflicting_impls<'tcx>( match used_to_be_allowed { None => { let reported = if overlap.with_impl.is_local() - || tcx.orphan_check_impl(impl_def_id).is_ok() + || tcx.ensure().orphan_check_impl(impl_def_id).is_ok() { let mut err = tcx.dcx().struct_span_err(impl_span, msg); err.code(E0119);