Edit GATs tests to apply lint

jackh726 · jackh726 · commit c2da21063f4a · 2021-10-16T19:04:39.000-04:00
diff --git a/src/test/ui/generic-associated-types/collections-project-default.rs b/src/test/ui/generic-associated-types/collections-project-default.rs
@@ -8,7 +8,7 @@
 // check that we don't normalize with trait defaults.
 
 trait Collection<T> {
-    type Iter<'iter>: Iterator<Item=&'iter T> where T: 'iter;
+    type Iter<'iter>: Iterator<Item=&'iter T> where T: 'iter, Self: 'iter;
     type Family: CollectionFamily;
     // Test associated type defaults with parameters
     type Sibling<U>: Collection<U> =
diff --git a/src/test/ui/generic-associated-types/collections.rs b/src/test/ui/generic-associated-types/collections.rs
@@ -8,7 +8,7 @@
 // run-pass
 
 trait Collection<T> {
-    type Iter<'iter>: Iterator<Item=&'iter T> where T: 'iter;
+    type Iter<'iter>: Iterator<Item=&'iter T> where T: 'iter, Self: 'iter;
     type Family: CollectionFamily;
     // Test associated type defaults with parameters
     type Sibling<U>: Collection<U> =
diff --git a/src/test/ui/generic-associated-types/generic-associated-type-bounds.rs b/src/test/ui/generic-associated-types/generic-associated-type-bounds.rs
@@ -3,7 +3,7 @@
 #![feature(generic_associated_types)]
 
 pub trait X {
-    type Y<'a>;
+    type Y<'a> where Self: 'a;
     fn m(&self) -> Self::Y<'_>;
 }
 
diff --git a/src/test/ui/generic-associated-types/issue-70303.rs b/src/test/ui/generic-associated-types/issue-70303.rs
@@ -3,7 +3,7 @@
 #![feature(generic_associated_types)]
 
 trait Document {
-    type Cursor<'a>: DocCursor<'a>;
+    type Cursor<'a>: DocCursor<'a> where Self: 'a;
 
     fn cursor(&self) -> Self::Cursor<'_>;
 }
diff --git a/src/test/ui/generic-associated-types/issue-76535.rs b/src/test/ui/generic-associated-types/issue-76535.rs
@@ -3,7 +3,7 @@
 pub trait SubTrait {}
 
 pub trait SuperTrait {
-    type SubType<'a>: SubTrait;
+    type SubType<'a>: SubTrait where Self: 'a;
 
     fn get_sub<'a>(&'a mut self) -> Self::SubType<'a>;
 }
diff --git a/src/test/ui/generic-associated-types/issue-76535.stderr b/src/test/ui/generic-associated-types/issue-76535.stderr
@@ -7,7 +7,7 @@ LL |     let sub: Box<dyn SuperTrait<SubType = SubStruct>> = Box::new(SuperStruc
 note: associated type defined here, with 1 lifetime parameter: `'a`
   --> $DIR/issue-76535.rs:6:10
    |
-LL |     type SubType<'a>: SubTrait;
+LL |     type SubType<'a>: SubTrait where Self: 'a;
    |          ^^^^^^^ --
 help: add missing lifetime argument
    |
@@ -25,7 +25,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all
    |
 LL | pub trait SuperTrait {
    |           ---------- this trait cannot be made into an object...
-LL |     type SubType<'a>: SubTrait;
+LL |     type SubType<'a>: SubTrait where Self: 'a;
    |          ^^^^^^^ ...because it contains the generic associated type `SubType`
    = help: consider moving `SubType` to another trait
 
@@ -40,7 +40,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all
    |
 LL | pub trait SuperTrait {
    |           ---------- this trait cannot be made into an object...
-LL |     type SubType<'a>: SubTrait;
+LL |     type SubType<'a>: SubTrait where Self: 'a;
    |          ^^^^^^^ ...because it contains the generic associated type `SubType`
    = help: consider moving `SubType` to another trait
    = note: required because of the requirements on the impl of `CoerceUnsized<Box<dyn SuperTrait<SubType = SubStruct<'_>>>>` for `Box<SuperStruct>`
diff --git a/src/test/ui/generic-associated-types/issue-79422.rs b/src/test/ui/generic-associated-types/issue-79422.rs
@@ -17,12 +17,12 @@ impl<'a, T> RefCont<'a, T> for Box<T> {
 }
 
 trait MapLike<K, V> {
-    type VRefCont<'a>: RefCont<'a, V>;
+    type VRefCont<'a>: RefCont<'a, V> where Self: 'a;
     fn get<'a>(&'a self, key: &K) -> Option<Self::VRefCont<'a>>;
 }
 
 impl<K: Ord, V: 'static> MapLike<K, V> for std::collections::BTreeMap<K, V> {
-    type VRefCont<'a> = &'a V;
+    type VRefCont<'a> where Self: 'a = &'a V;
     fn get<'a>(&'a self, key: &K) -> Option<&'a V> {
         std::collections::BTreeMap::get(self, key)
     }
diff --git a/src/test/ui/generic-associated-types/issue-79422.stderr b/src/test/ui/generic-associated-types/issue-79422.stderr
@@ -7,7 +7,7 @@ LL |         as Box<dyn MapLike<u8, u8, VRefCont = dyn RefCont<'_, u8>>>;
 note: associated type defined here, with 1 lifetime parameter: `'a`
   --> $DIR/issue-79422.rs:20:10
    |
-LL |     type VRefCont<'a>: RefCont<'a, V>;
+LL |     type VRefCont<'a>: RefCont<'a, V> where Self: 'a;
    |          ^^^^^^^^ --
 help: add missing lifetime argument
    |
@@ -25,7 +25,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all
    |
 LL | trait MapLike<K, V> {
    |       ------- this trait cannot be made into an object...
-LL |     type VRefCont<'a>: RefCont<'a, V>;
+LL |     type VRefCont<'a>: RefCont<'a, V> where Self: 'a;
    |          ^^^^^^^^ ...because it contains the generic associated type `VRefCont`
    = help: consider moving `VRefCont` to another trait
 
@@ -40,7 +40,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all
    |
 LL | trait MapLike<K, V> {
    |       ------- this trait cannot be made into an object...
-LL |     type VRefCont<'a>: RefCont<'a, V>;
+LL |     type VRefCont<'a>: RefCont<'a, V> where Self: 'a;
    |          ^^^^^^^^ ...because it contains the generic associated type `VRefCont`
    = help: consider moving `VRefCont` to another trait
    = note: required because of the requirements on the impl of `CoerceUnsized<Box<dyn MapLike<u8, u8, VRefCont = (dyn RefCont<'_, u8> + 'static)>>>` for `Box<BTreeMap<u8, u8>>`
diff --git a/src/test/ui/generic-associated-types/issue-86787.rs b/src/test/ui/generic-associated-types/issue-86787.rs
@@ -9,6 +9,7 @@ enum Either<L, R> {
 pub trait HasChildrenOf {
     type T;
     type TRef<'a>;
+    //~^ Missing required bounds
 
     fn ref_children<'a>(&'a self) -> Vec<Self::TRef<'a>>;
     fn take_children(self) -> Vec<Self::T>;
@@ -20,9 +21,9 @@ where
     Right: HasChildrenOf,
 {
     type T = Either<Left::T, Right::T>;
+    // We used to error below because the where clause doesn't match the trait.
+    // Now, we error early on the trait itself.
     type TRef<'a>
-    //~^ `impl` associated type signature
-    //~^^ `impl` associated type signature
     where
     <Left as HasChildrenOf>::T: 'a,
     <Right as HasChildrenOf>::T: 'a
diff --git a/src/test/ui/generic-associated-types/issue-86787.stderr b/src/test/ui/generic-associated-types/issue-86787.stderr
@@ -1,32 +1,10 @@
-error: `impl` associated type signature for `TRef` doesn't match `trait` associated type signature
-  --> $DIR/issue-86787.rs:23:5
+error: Missing required bounds on TRef
+  --> $DIR/issue-86787.rs:11:5
    |
-LL |       type TRef<'a>;
-   |       -------------- expected
-...
-LL | /     type TRef<'a>
-LL | |
-LL | |
-LL | |     where
-LL | |     <Left as HasChildrenOf>::T: 'a,
-LL | |     <Right as HasChildrenOf>::T: 'a
-LL | |     = Either<&'a Left::T, &'a Right::T>;
-   | |________________________________________^ found
+LL |     type TRef<'a>;
+   |     ^^^^^^^^^^^^^-
+   |                  |
+   |                  help: add the required where clauses: `where Self: 'a`
 
-error: `impl` associated type signature for `TRef` doesn't match `trait` associated type signature
-  --> $DIR/issue-86787.rs:23:5
-   |
-LL |       type TRef<'a>;
-   |       -------------- expected
-...
-LL | /     type TRef<'a>
-LL | |
-LL | |
-LL | |     where
-LL | |     <Left as HasChildrenOf>::T: 'a,
-LL | |     <Right as HasChildrenOf>::T: 'a
-LL | |     = Either<&'a Left::T, &'a Right::T>;
-   | |________________________________________^ found
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-88287.rs b/src/test/ui/generic-associated-types/issue-88287.rs
@@ -13,7 +13,8 @@ trait SearchableResource<Criteria> {
 trait SearchableResourceExt<Criteria>: SearchableResource<Criteria> {
     type Future<'f, A: 'f + ?Sized, B: 'f>: Future<Output = Result<Vec<A::SearchResult>, ()>> + 'f
     where
-        A: SearchableResource<B>;
+        A: SearchableResource<B>,
+        Self: 'f;
 
     fn search<'c>(&'c self, client: &'c ()) -> Self::Future<'c, Self, Criteria>;
 }
@@ -29,6 +30,7 @@ where
     type Future<'f, A, B: 'f>
     where
         A: SearchableResource<B> + ?Sized + 'f,
+        Self: 'f,
     = SearchFutureTy<'f, A, B>;
 
     fn search<'c>(&'c self, _client: &'c ()) -> Self::Future<'c, Self, Criteria> {
diff --git a/src/test/ui/generic-associated-types/issue-88360.rs b/src/test/ui/generic-associated-types/issue-88360.rs
@@ -1,13 +1,14 @@
 #![feature(generic_associated_types)]
 
 trait GatTrait {
-    type Gat<'a>;
+    type Gat<'a> where Self: 'a;
 
     fn test(&self) -> Self::Gat<'_>;
 }
 
 trait SuperTrait<T>
 where
+    Self: 'static,
     for<'a> Self: GatTrait<Gat<'a> = &'a T>,
 {
     fn copy(&self) -> Self::Gat<'_> where T: Copy {
diff --git a/src/test/ui/generic-associated-types/issue-88360.stderr b/src/test/ui/generic-associated-types/issue-88360.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-88360.rs:14:9
+  --> $DIR/issue-88360.rs:15:9
    |
 LL | trait SuperTrait<T>
    |                  - this type parameter
diff --git a/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.rs b/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.rs
@@ -1,7 +1,7 @@
 #![feature(generic_associated_types)]
 
 pub trait X {
-    type Y<'a>;
+    type Y<'a> where Self: 'a;
     fn m(&self) -> Self::Y<'_>;
 }
 
diff --git a/src/test/ui/generic-associated-types/streaming_iterator.rs b/src/test/ui/generic-associated-types/streaming_iterator.rs
@@ -5,12 +5,12 @@
 use std::fmt::Display;
 
 trait StreamingIterator {
-    type Item<'a>;
+    type Item<'a> where Self: 'a;
     // Applying the lifetime parameter `'a` to `Self::Item` inside the trait.
     fn next<'a>(&'a mut self) -> Option<Self::Item<'a>>;
 }
 
-struct Foo<T: StreamingIterator> {
+struct Foo<T: StreamingIterator + 'static> {
     // Applying a concrete lifetime to the constructor outside the trait.
     bar: <T as StreamingIterator>::Item<'static>,
 }
@@ -30,7 +30,7 @@ struct StreamEnumerate<I> {
 }
 
 impl<I: StreamingIterator> StreamingIterator for StreamEnumerate<I> {
-    type Item<'a> = (usize, I::Item<'a>);
+    type Item<'a> where Self: 'a = (usize, I::Item<'a>);
     fn next<'a>(&'a mut self) -> Option<Self::Item<'a>> {
         match self.iter.next() {
             None => None,
@@ -44,7 +44,7 @@ impl<I: StreamingIterator> StreamingIterator for StreamEnumerate<I> {
 }
 
 impl<I: Iterator> StreamingIterator for I {
-    type Item<'a> = <I as Iterator>::Item;
+    type Item<'a> where Self: 'a = <I as Iterator>::Item;
     fn next(&mut self) -> Option<<I as StreamingIterator>::Item<'_>> {
         Iterator::next(self)
     }
diff --git a/src/test/ui/generic-associated-types/variance_constraints.rs b/src/test/ui/generic-associated-types/variance_constraints.rs
@@ -3,7 +3,7 @@
 #![feature(generic_associated_types)]
 
 trait A {
-    type B<'a>;
+    type B<'a> where Self: 'a;
 
     fn make_b<'a>(&'a self) -> Self::B<'a>;
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#![feature(generic_associated_types)]`
`4`	`4`
`5`	`5`	`pub trait X {`
`6`		`- type Y<'a>;`
	`6`	`+ type Y<'a> where Self: 'a;`
`7`	`7`	`fn m(&self) -> Self::Y<'_>;`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#![feature(generic_associated_types)]`
`4`	`4`
`5`	`5`	`trait Document {`
`6`		`- type Cursor<'a>: DocCursor<'a>;`
	`6`	`+ type Cursor<'a>: DocCursor<'a> where Self: 'a;`
`7`	`7`
`8`	`8`	`fn cursor(&self) -> Self::Cursor<'_>;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`pub trait SubTrait {}`
`4`	`4`
`5`	`5`	`pub trait SuperTrait {`
`6`		`- type SubType<'a>: SubTrait;`
	`6`	`+ type SubType<'a>: SubTrait where Self: 'a;`
`7`	`7`
`8`	`8`	`fn get_sub<'a>(&'a mut self) -> Self::SubType<'a>;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| let sub: Box<dyn SuperTrait<SubType = SubStruct>> = Box::new(SuperStruc`
`7`	`7`	note: associated type defined here, with 1 lifetime parameter: `'a`
`8`	`8`	`--> $DIR/issue-76535.rs:6:10`
`9`	`9`	`\|`
`10`		`-LL \| type SubType<'a>: SubTrait;`
	`10`	`+LL \| type SubType<'a>: SubTrait where Self: 'a;`
`11`	`11`	`\| ^^^^^^^ --`
`12`	`12`	`help: add missing lifetime argument`
`13`	`13`	`\|`
`@@ -25,7 +25,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all`
`25`	`25`	`\|`
`26`	`26`	`LL \| pub trait SuperTrait {`
`27`	`27`	`\| ---------- this trait cannot be made into an object...`
`28`		`-LL \| type SubType<'a>: SubTrait;`
	`28`	`+LL \| type SubType<'a>: SubTrait where Self: 'a;`
`29`	`29`	\| ^^^^^^^ ...because it contains the generic associated type `SubType`
`30`	`30`	= help: consider moving `SubType` to another trait
`31`	`31`
`@@ -40,7 +40,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all`
`40`	`40`	`\|`
`41`	`41`	`LL \| pub trait SuperTrait {`
`42`	`42`	`\| ---------- this trait cannot be made into an object...`
`43`		`-LL \| type SubType<'a>: SubTrait;`
	`43`	`+LL \| type SubType<'a>: SubTrait where Self: 'a;`
`44`	`44`	\| ^^^^^^^ ...because it contains the generic associated type `SubType`
`45`	`45`	= help: consider moving `SubType` to another trait
`46`	`46`	= note: required because of the requirements on the impl of `CoerceUnsized<Box<dyn SuperTrait<SubType = SubStruct<'_>>>>` for `Box<SuperStruct>`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ impl<'a, T> RefCont<'a, T> for Box<T> {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`trait MapLike<K, V> {`
`20`		`- type VRefCont<'a>: RefCont<'a, V>;`
	`20`	`+ type VRefCont<'a>: RefCont<'a, V> where Self: 'a;`
`21`	`21`	`fn get<'a>(&'a self, key: &K) -> Option<Self::VRefCont<'a>>;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`impl<K: Ord, V: 'static> MapLike<K, V> for std::collections::BTreeMap<K, V> {`
`25`		`- type VRefCont<'a> = &'a V;`
	`25`	`+ type VRefCont<'a> where Self: 'a = &'a V;`
`26`	`26`	`fn get<'a>(&'a self, key: &K) -> Option<&'a V> {`
`27`	`27`	`std::collections::BTreeMap::get(self, key)`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| as Box<dyn MapLike<u8, u8, VRefCont = dyn RefCont<'_, u8>>>;`
`7`	`7`	note: associated type defined here, with 1 lifetime parameter: `'a`
`8`	`8`	`--> $DIR/issue-79422.rs:20:10`
`9`	`9`	`\|`
`10`		`-LL \| type VRefCont<'a>: RefCont<'a, V>;`
	`10`	`+LL \| type VRefCont<'a>: RefCont<'a, V> where Self: 'a;`
`11`	`11`	`\| ^^^^^^^^ --`
`12`	`12`	`help: add missing lifetime argument`
`13`	`13`	`\|`
`@@ -25,7 +25,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all`
`25`	`25`	`\|`
`26`	`26`	`LL \| trait MapLike<K, V> {`
`27`	`27`	`\| ------- this trait cannot be made into an object...`
`28`		`-LL \| type VRefCont<'a>: RefCont<'a, V>;`
	`28`	`+LL \| type VRefCont<'a>: RefCont<'a, V> where Self: 'a;`
`29`	`29`	\| ^^^^^^^^ ...because it contains the generic associated type `VRefCont`
`30`	`30`	= help: consider moving `VRefCont` to another trait
`31`	`31`
`@@ -40,7 +40,7 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all`
`40`	`40`	`\|`
`41`	`41`	`LL \| trait MapLike<K, V> {`
`42`	`42`	`\| ------- this trait cannot be made into an object...`
`43`		`-LL \| type VRefCont<'a>: RefCont<'a, V>;`
	`43`	`+LL \| type VRefCont<'a>: RefCont<'a, V> where Self: 'a;`
`44`	`44`	\| ^^^^^^^^ ...because it contains the generic associated type `VRefCont`
`45`	`45`	= help: consider moving `VRefCont` to another trait
`46`	`46`	= note: required because of the requirements on the impl of `CoerceUnsized<Box<dyn MapLike<u8, u8, VRefCont = (dyn RefCont<'_, u8> + 'static)>>>` for `Box<BTreeMap<u8, u8>>`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`#![feature(generic_associated_types)]`
`2`	`2`
`3`	`3`	`trait GatTrait {`
`4`		`- type Gat<'a>;`
	`4`	`+ type Gat<'a> where Self: 'a;`
`5`	`5`
`6`	`6`	`fn test(&self) -> Self::Gat<'_>;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`trait SuperTrait<T>`
`10`	`10`	`where`
	`11`	`+ Self: 'static,`
`11`	`12`	`for<'a> Self: GatTrait<Gat<'a> = &'a T>,`
`12`	`13`	`{`
`13`	`14`	`fn copy(&self) -> Self::Gat<'_> where T: Copy {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0308]: mismatched types`
`2`		`- --> $DIR/issue-88360.rs:14:9`
	`2`	`+ --> $DIR/issue-88360.rs:15:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| trait SuperTrait<T>`
`5`	`5`	`\| - this type parameter`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#![feature(generic_associated_types)]`
`2`	`2`
`3`	`3`	`pub trait X {`
`4`		`- type Y<'a>;`
	`4`	`+ type Y<'a> where Self: 'a;`
`5`	`5`	`fn m(&self) -> Self::Y<'_>;`
`6`	`6`	`}`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`use std::fmt::Display;`
`6`	`6`
`7`	`7`	`trait StreamingIterator {`
`8`		`- type Item<'a>;`
	`8`	`+ type Item<'a> where Self: 'a;`
`9`	`9`	// Applying the lifetime parameter `'a` to `Self::Item` inside the trait.
`10`	`10`	`fn next<'a>(&'a mut self) -> Option<Self::Item<'a>>;`
`11`	`11`	`}`
`12`	`12`
`13`		`-struct Foo<T: StreamingIterator> {`
	`13`	`+struct Foo<T: StreamingIterator + 'static> {`
`14`	`14`	`// Applying a concrete lifetime to the constructor outside the trait.`
`15`	`15`	`bar: <T as StreamingIterator>::Item<'static>,`
`16`	`16`	`}`
`@@ -30,7 +30,7 @@ struct StreamEnumerate<I> {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`impl<I: StreamingIterator> StreamingIterator for StreamEnumerate<I> {`
`33`		`- type Item<'a> = (usize, I::Item<'a>);`
	`33`	`+ type Item<'a> where Self: 'a = (usize, I::Item<'a>);`
`34`	`34`	`fn next<'a>(&'a mut self) -> Option<Self::Item<'a>> {`
`35`	`35`	`match self.iter.next() {`
`36`	`36`	`None => None,`
`@@ -44,7 +44,7 @@ impl<I: StreamingIterator> StreamingIterator for StreamEnumerate<I> {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`impl<I: Iterator> StreamingIterator for I {`
`47`		`- type Item<'a> = <I as Iterator>::Item;`
	`47`	`+ type Item<'a> where Self: 'a = <I as Iterator>::Item;`
`48`	`48`	`fn next(&mut self) -> Option<<I as StreamingIterator>::Item<'_>> {`
`49`	`49`	`Iterator::next(self)`
`50`	`50`	`}`