From b052d76586988040c6ae8aef609794ae16cc28dc Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jnelson@cloudflare.com>
Date: Tue, 21 Jun 2022 19:43:46 -0500
Subject: Address review comments from #98259

It got merged so fast I didn't have time to make changes xD
---
 src/test/ui/async-await/issue-68112.stderr                            | 4 ++--
 .../ui/async-await/issue-70935-complex-spans.drop_tracking.stderr     | 4 ++--
 src/test/ui/async-await/issue-70935-complex-spans.rs                  | 4 ++--
 src/test/ui/async-await/partial-drop-partial-reinit.rs                | 2 +-
 src/test/ui/async-await/partial-drop-partial-reinit.stderr            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/test/ui/async-await/issue-68112.stderr b/src/test/ui/async-await/issue-68112.stderr
index b8d3e1540d8..4285fbbeceb 100644
--- a/src/test/ui/async-await/issue-68112.stderr
+++ b/src/test/ui/async-await/issue-68112.stderr
@@ -42,7 +42,7 @@ LL |     require_send(send_fut);
    |
    = help: the trait `Sync` is not implemented for `RefCell<i32>`
    = note: required because of the requirements on the impl of `Send` for `Arc<RefCell<i32>>`
-note: required because it's used within this async block
+note: required because it's used within this `async fn` body
   --> $DIR/issue-68112.rs:47:31
    |
 LL | async fn ready2<T>(t: T) -> T { t }
@@ -53,7 +53,7 @@ note: required because it appears within the type `impl Future<Output = Arc<RefC
 LL | fn make_non_send_future2() -> impl Future<Output = Arc<RefCell<i32>>> {
    |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: required because it captures the following types: `ResumeTy`, `impl Future<Output = Arc<RefCell<i32>>>`, `()`, `i32`, `Ready<i32>`
-note: required because it's used within this async block
+note: required because it's used within this `async` block
   --> $DIR/issue-68112.rs:55:26
    |
 LL |       let send_fut = async {
diff --git a/src/test/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr b/src/test/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr
index 19fd5eb7c73..43b7cb8cece 100644
--- a/src/test/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr
+++ b/src/test/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr
@@ -14,7 +14,7 @@ LL |           baz(|| async{
 LL | |             foo(tx.clone());
 LL | |         }).await;
    | |_________^
-note: required because it's used within this async block
+note: required because it's used within this `async fn` body
   --> $DIR/issue-70935-complex-spans.rs:9:67
    |
 LL |   async fn baz<T>(_c: impl FnMut() -> T) where T: Future<Output=()> {
@@ -23,7 +23,7 @@ LL | |
 LL | | }
    | |_^
    = note: required because it captures the following types: `ResumeTy`, `impl Future<Output = ()>`, `()`
-note: required because it's used within this async block
+note: required because it's used within this `async` block
   --> $DIR/issue-70935-complex-spans.rs:23:16
    |
 LL |       async move {
diff --git a/src/test/ui/async-await/issue-70935-complex-spans.rs b/src/test/ui/async-await/issue-70935-complex-spans.rs
index 4bf94fe342c..f45ce1f25ef 100644
--- a/src/test/ui/async-await/issue-70935-complex-spans.rs
+++ b/src/test/ui/async-await/issue-70935-complex-spans.rs
@@ -7,7 +7,7 @@
 use std::future::Future;
 
 async fn baz<T>(_c: impl FnMut() -> T) where T: Future<Output=()> {
-//[drop_tracking]~^ within this async block
+//[drop_tracking]~^ within this `async fn` body
 }
 
 fn foo(tx: std::sync::mpsc::Sender<i32>) -> impl Future + Send {
@@ -21,7 +21,7 @@ fn foo(tx: std::sync::mpsc::Sender<i32>) -> impl Future + Send {
     //[drop_tracking]~|  NOTE: in this expansion
     //[drop_tracking]~|  NOTE: in this expansion
     async move {
-    //[drop_tracking]~^ within this async block
+    //[drop_tracking]~^ within this `async` block
         baz(|| async{ //[drop_tracking]~ NOTE: used within this closure
             foo(tx.clone());
         }).await;
diff --git a/src/test/ui/async-await/partial-drop-partial-reinit.rs b/src/test/ui/async-await/partial-drop-partial-reinit.rs
index 4fcfacea3f8..fe0fce7afd9 100644
--- a/src/test/ui/async-await/partial-drop-partial-reinit.rs
+++ b/src/test/ui/async-await/partial-drop-partial-reinit.rs
@@ -26,7 +26,7 @@ impl Drop for NotSend {
 impl !Send for NotSend {}
 
 async fn foo() {
-//~^ NOTE used within this async block
+//~^ NOTE used within this `async fn` body
 //~| NOTE within this `impl Future
     let mut x = (NotSend {},);
     drop(x.0);
diff --git a/src/test/ui/async-await/partial-drop-partial-reinit.stderr b/src/test/ui/async-await/partial-drop-partial-reinit.stderr
index 96d0c71f103..05f5358340a 100644
--- a/src/test/ui/async-await/partial-drop-partial-reinit.stderr
+++ b/src/test/ui/async-await/partial-drop-partial-reinit.stderr
@@ -12,7 +12,7 @@ LL | async fn foo() {
    = help: within `impl Future<Output = ()>`, the trait `Send` is not implemented for `NotSend`
    = note: required because it appears within the type `(NotSend,)`
    = note: required because it captures the following types: `ResumeTy`, `(NotSend,)`, `impl Future<Output = ()>`, `()`
-note: required because it's used within this async block
+note: required because it's used within this `async fn` body
   --> $DIR/partial-drop-partial-reinit.rs:28:16
    |
 LL |   async fn foo() {
-- 
cgit 1.4.1-3-g733a5