Replace complicated hir access with tcx.coroutine_kind

Author: metamuffin

compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs

@@ -1836,10 +1836,9 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
             if should_suggest_fixes
                 && !matches!(terr, TypeError::RegionsInsufficientlyPolymorphic(..))
             {
-                let hir = self.tcx.hir_node_by_def_id(cause.body_id);
                 self.suggest_tuple_pattern(cause, &exp_found, diag);
                 self.suggest_accessing_field_where_appropriate(cause, &exp_found, diag);
-                self.suggest_await_on_expect_found(cause, span, hir, &exp_found, diag);
+                self.suggest_await_on_expect_found(cause, span, &exp_found, diag);
                 self.suggest_function_pointers(cause, span, &exp_found, diag);
                 self.suggest_turning_stmt_into_expr(cause, &exp_found, diag);
             }

compiler/rustc_trait_selection/src/error_reporting/infer/suggest.rs

@@ -159,7 +159,6 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
         &self,
         cause: &ObligationCause<'tcx>,
         exp_span: Span,
-        hir: hir::Node<'_>,
         exp_found: &ty::error::ExpectedFound<Ty<'tcx>>,
         diag: &mut Diag<'_>,
     ) {
@@ -169,17 +168,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
         );
 
         let is_async_block = matches!(
-            hir,
-            rustc_hir::Node::Expr(rustc_hir::Expr {
-                kind: rustc_hir::ExprKind::Closure(rustc_hir::Closure {
-                    kind: rustc_hir::ClosureKind::Coroutine(rustc_hir::CoroutineKind::Desugared(
-                        rustc_hir::CoroutineDesugaring::Async,
-                        _
-                    )),
-                    ..
-                }),
-                ..
-            })
+            self.tcx.coroutine_kind(cause.body_id),
+            Some(rustc_hir::CoroutineKind::Desugared(rustc_hir::CoroutineDesugaring::Async, _)),
         );
         if !is_async_block {
             return;