From ea562aeed553eaee9961a2adb259f48ffbe83666 Mon Sep 17 00:00:00 2001
From: Jack Huey <31162821+jackh726@users.noreply.github.com>
Date: Sat, 15 Jan 2022 23:17:32 -0500
Subject: [PATCH] Add nll revision for issue-92096 test that passes

---
 ...issue-92096.stderr => issue-92096.migrate.stderr} |  4 ++--
 src/test/ui/generic-associated-types/issue-92096.rs  | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)
 rename src/test/ui/generic-associated-types/{issue-92096.stderr => issue-92096.migrate.stderr} (92%)

diff --git a/src/test/ui/generic-associated-types/issue-92096.stderr b/src/test/ui/generic-associated-types/issue-92096.migrate.stderr
similarity index 92%
rename from src/test/ui/generic-associated-types/issue-92096.stderr
rename to src/test/ui/generic-associated-types/issue-92096.migrate.stderr
index a897ba5b966..72ade5774d7 100644
--- a/src/test/ui/generic-associated-types/issue-92096.stderr
+++ b/src/test/ui/generic-associated-types/issue-92096.migrate.stderr
@@ -1,5 +1,5 @@
 error[E0311]: the parameter type `C` may not live long enough
-  --> $DIR/issue-92096.rs:18:33
+  --> $DIR/issue-92096.rs:20:33
    |
 LL | fn call_connect<C>(c: &'_ C) -> impl '_ + Future + Send
    |                 -               ^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `C` will meet its required lifetime bounds
@@ -7,7 +7,7 @@ LL | fn call_connect<C>(c: &'_ C) -> impl '_ + Future + Send
    |                 help: consider adding an explicit lifetime bound...: `C: 'a`
 
 error[E0311]: the parameter type `C` may not live long enough
-  --> $DIR/issue-92096.rs:18:33
+  --> $DIR/issue-92096.rs:20:33
    |
 LL | fn call_connect<C>(c: &'_ C) -> impl '_ + Future + Send
    |                 -               ^^^^^^^^^^^^^^^^^^^^^^^ ...so that the type `C` will meet its required lifetime bounds
diff --git a/src/test/ui/generic-associated-types/issue-92096.rs b/src/test/ui/generic-associated-types/issue-92096.rs
index 6c81babc0bc..066132a5d98 100644
--- a/src/test/ui/generic-associated-types/issue-92096.rs
+++ b/src/test/ui/generic-associated-types/issue-92096.rs
@@ -1,8 +1,10 @@
 // edition:2018
-// check-fail
-// FIXME(generic_associated_types): this should pass, but we end up
-// essentially requiring that `for<'s> C: 's`
+// [nll] check-pass
+// revisions: migrate nll
+// Explicitly testing nll with revision, so ignore compare-mode=nll
+// ignore-compare-mode-nll
 
+#![cfg_attr(nll, feature(nll))]
 #![feature(generic_associated_types)]
 
 use std::future::Future;
@@ -16,8 +18,8 @@ trait Client {
 }
 
 fn call_connect<C>(c: &'_ C) -> impl '_ + Future + Send
-//~^ ERROR the parameter
-//~| ERROR the parameter
+//[migrate]~^ ERROR the parameter
+//[migrate]~| ERROR the parameter
 where
     C: Client + Send + Sync,
 {