From dc45eb93f7541b3033487abaee653cb5bf6602d5 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Thu, 1 Dec 2022 23:53:36 -0500
Subject: Revert 88f2140

---
 src/test/ui/issues/issue-35976.rs                | 14 +++++++++-----
 src/test/ui/issues/issue-35976.stderr            | 11 -----------
 src/test/ui/issues/issue-35976.unimported.stderr | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 16 deletions(-)
 delete mode 100644 src/test/ui/issues/issue-35976.stderr
 create mode 100644 src/test/ui/issues/issue-35976.unimported.stderr

(limited to 'src/test')

diff --git a/src/test/ui/issues/issue-35976.rs b/src/test/ui/issues/issue-35976.rs
index d075794d994..aa6f74cb5d4 100644
--- a/src/test/ui/issues/issue-35976.rs
+++ b/src/test/ui/issues/issue-35976.rs
@@ -1,5 +1,9 @@
+// revisions: imported unimported
+//[imported] check-pass
+
 mod private {
     pub trait Future {
+        //[unimported]~^^ HELP perhaps add a `use` for it
         fn wait(&self) where Self: Sized;
     }
 
@@ -8,13 +12,13 @@ mod private {
     }
 }
 
-//use private::Future;
+#[cfg(imported)]
+use private::Future;
 
 fn bar(arg: Box<dyn private::Future>) {
+    // Importing the trait means that we don't autoderef `Box<dyn Future>`
     arg.wait();
-    //~^ ERROR the `wait` method cannot be invoked on a trait object
+    //[unimported]~^ ERROR the `wait` method cannot be invoked on a trait object
 }
 
-fn main() {
-
-}
+fn main() {}
diff --git a/src/test/ui/issues/issue-35976.stderr b/src/test/ui/issues/issue-35976.stderr
deleted file mode 100644
index fe16f97b9d0..00000000000
--- a/src/test/ui/issues/issue-35976.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error: the `wait` method cannot be invoked on a trait object
-  --> $DIR/issue-35976.rs:14:9
-   |
-LL |         fn wait(&self) where Self: Sized;
-   |                                    ----- this has a `Sized` requirement
-...
-LL |     arg.wait();
-   |         ^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/issues/issue-35976.unimported.stderr b/src/test/ui/issues/issue-35976.unimported.stderr
new file mode 100644
index 00000000000..5d61bb8ea37
--- /dev/null
+++ b/src/test/ui/issues/issue-35976.unimported.stderr
@@ -0,0 +1,16 @@
+error: the `wait` method cannot be invoked on a trait object
+  --> $DIR/issue-35976.rs:20:9
+   |
+LL |         fn wait(&self) where Self: Sized;
+   |                                    ----- this has a `Sized` requirement
+...
+LL |     arg.wait();
+   |         ^^^^
+   |
+help: another candidate was found in the following trait, perhaps add a `use` for it:
+   |
+LL | use private::Future;
+   |
+
+error: aborting due to previous error
+
-- 
cgit 1.4.1-3-g733a5