Revise the tests for coroutine/auto-trait-regions

Author: amandasystems

tests/ui/async-await/higher-ranked-auto-trait-13.assumptions.stderr

@@ -4,7 +4,7 @@ error: implementation of `Getter` is not general enough
 LL |     assert_send(my_send_async_method(struct_with_lifetime, data));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Getter` is not general enough
    |
-   = note: `Getter<'1>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'_>>`, for any two lifetimes `'0` and `'1`...
+   = note: `Getter<'_>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'1>>`, for any two lifetimes `'0` and `'1`...
    = note: ...but `Getter<'2>` is actually implemented for the type `GetterImpl<'2, ConstructableImpl<'_>>`, for some specific lifetime `'2`
 
 error: implementation of `Getter` is not general enough
@@ -15,15 +15,14 @@ LL |     assert_send(my_send_async_method(struct_with_lifetime, data));
    |
    = note: `Getter<'1>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'_>>`, for any two lifetimes `'0` and `'1`...
    = note: ...but `Getter<'2>` is actually implemented for the type `GetterImpl<'2, ConstructableImpl<'_>>`, for some specific lifetime `'2`
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
 error: implementation of `Getter` is not general enough
   --> $DIR/higher-ranked-auto-trait-13.rs:65:5
    |
 LL |     assert_send(my_send_async_method(struct_with_lifetime, data));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Getter` is not general enough
    |
-   = note: `Getter<'1>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'_>>`, for any two lifetimes `'0` and `'1`...
+   = note: `Getter<'_>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'1>>`, for any two lifetimes `'0` and `'1`...
    = note: ...but `Getter<'2>` is actually implemented for the type `GetterImpl<'2, ConstructableImpl<'_>>`, for some specific lifetime `'2`
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 

tests/ui/async-await/higher-ranked-auto-trait-13.no_assumptions.stderr

@@ -4,7 +4,7 @@ error: implementation of `Getter` is not general enough
 LL |     assert_send(my_send_async_method(struct_with_lifetime, data));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Getter` is not general enough
    |
-   = note: `Getter<'1>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'_>>`, for any two lifetimes `'0` and `'1`...
+   = note: `Getter<'_>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'1>>`, for any two lifetimes `'0` and `'1`...
    = note: ...but `Getter<'2>` is actually implemented for the type `GetterImpl<'2, ConstructableImpl<'_>>`, for some specific lifetime `'2`
 
 error: implementation of `Getter` is not general enough
@@ -15,7 +15,6 @@ LL |     assert_send(my_send_async_method(struct_with_lifetime, data));
    |
    = note: `Getter<'1>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'_>>`, for any two lifetimes `'0` and `'1`...
    = note: ...but `Getter<'2>` is actually implemented for the type `GetterImpl<'2, ConstructableImpl<'_>>`, for some specific lifetime `'2`
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
 error: implementation of `Callable` is not general enough
   --> $DIR/higher-ranked-auto-trait-13.rs:65:5
@@ -32,7 +31,7 @@ error: implementation of `Getter` is not general enough
 LL |     assert_send(my_send_async_method(struct_with_lifetime, data));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Getter` is not general enough
    |
-   = note: `Getter<'1>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'_>>`, for any two lifetimes `'0` and `'1`...
+   = note: `Getter<'_>` would have to be implemented for the type `GetterImpl<'0, ConstructableImpl<'1>>`, for any two lifetimes `'0` and `'1`...
    = note: ...but `Getter<'2>` is actually implemented for the type `GetterImpl<'2, ConstructableImpl<'_>>`, for some specific lifetime `'2`
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 

tests/ui/coroutine/auto-trait-regions.rs

@@ -20,6 +20,19 @@ impl<'a> Foo for &'a OnlyFooIfRef {}
 
 fn assert_foo<T: Foo>(f: T) {}
 
+fn other_assertion() {
+    // Disallow impls which relates lifetimes in the coroutine interior
+    let generator = #[coroutine] move || {
+        let a = A(&mut true, &mut true, No);
+        //~^ ERROR borrow may still be in use when coroutine yields
+        //~| ERROR borrow may still be in use when coroutine yields
+        yield;
+        assert_foo(a);
+    };
+    assert_foo(generator);
+    //~^ ERROR not general enough
+}
+
 fn main() {
     // Make sure 'static is erased for coroutine interiors so we can't match it in trait selection
     let x: &'static _ = &OnlyFooIfStaticRef(No);
@@ -39,15 +52,4 @@ fn main() {
         assert_foo(x);
     };
     assert_foo(generator); // ok
-
-    // Disallow impls which relates lifetimes in the coroutine interior
-    let generator = #[coroutine] move || {
-        let a = A(&mut true, &mut true, No);
-        //~^ ERROR borrow may still be in use when coroutine yields
-        //~| ERROR borrow may still be in use when coroutine yields
-        yield;
-        assert_foo(a);
-    };
-    assert_foo(generator);
-    //~^ ERROR not general enough
 }

tests/ui/coroutine/auto-trait-regions.stderr

@@ -1,5 +1,5 @@
 error[E0626]: borrow may still be in use when coroutine yields
-  --> $DIR/auto-trait-regions.rs:45:19
+  --> $DIR/auto-trait-regions.rs:26:19
    |
 LL |     let generator = #[coroutine] move || {
    |                                  ------- within this coroutine
@@ -15,7 +15,7 @@ LL |     let generator = #[coroutine] static move || {
    |                                  ++++++
 
 error[E0626]: borrow may still be in use when coroutine yields
-  --> $DIR/auto-trait-regions.rs:45:30
+  --> $DIR/auto-trait-regions.rs:26:30
    |
 LL |     let generator = #[coroutine] move || {
    |                                  ------- within this coroutine
@@ -31,22 +31,22 @@ LL |     let generator = #[coroutine] static move || {
    |                                  ++++++
 
 error: implementation of `Foo` is not general enough
-  --> $DIR/auto-trait-regions.rs:31:5
+  --> $DIR/auto-trait-regions.rs:32:5
    |
 LL |     assert_foo(generator);
    |     ^^^^^^^^^^^^^^^^^^^^^ implementation of `Foo` is not general enough
    |
-   = note: `&'0 OnlyFooIfStaticRef` must implement `Foo`, for any lifetime `'0`...
-   = note: ...but `Foo` is actually implemented for the type `&'static OnlyFooIfStaticRef`
+   = note: `Foo` would have to be implemented for the type `A<'0, '1>`, for any two lifetimes `'0` and `'1`...
+   = note: ...but `Foo` is actually implemented for the type `A<'_, '2>`, for some specific lifetime `'2`
 
 error: implementation of `Foo` is not general enough
-  --> $DIR/auto-trait-regions.rs:51:5
+  --> $DIR/auto-trait-regions.rs:44:5
    |
 LL |     assert_foo(generator);
    |     ^^^^^^^^^^^^^^^^^^^^^ implementation of `Foo` is not general enough
    |
-   = note: `Foo` would have to be implemented for the type `A<'0, '1>`, for any two lifetimes `'0` and `'1`...
-   = note: ...but `Foo` is actually implemented for the type `A<'_, '2>`, for some specific lifetime `'2`
+   = note: `&'0 OnlyFooIfStaticRef` must implement `Foo`, for any lifetime `'0`...
+   = note: ...but `Foo` is actually implemented for the type `&'static OnlyFooIfStaticRef`
 
 error: aborting due to 4 previous errors