Update tests

varkor · varkor · commit 048ba28ad1ec · 2019-04-18T18:35:18.000+01:00
diff --git a/src/test/ui/error-codes/E0392.stderr b/src/test/ui/error-codes/E0392.stderr
@@ -2,7 +2,7 @@ error[E0392]: parameter `T` is never used
   --> $DIR/E0392.rs:1:10
    |
 LL | enum Foo<T> { Bar }
-   |          ^ unused type parameter
+   |          ^ unused parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/inner-static-type-parameter.stderr b/src/test/ui/inner-static-type-parameter.stderr
@@ -12,7 +12,7 @@ error[E0392]: parameter `T` is never used
   --> $DIR/inner-static-type-parameter.rs:3:10
    |
 LL | enum Bar<T> { What }
-   |          ^ unused type parameter
+   |          ^ unused parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/issues/issue-17904-2.stderr b/src/test/ui/issues/issue-17904-2.stderr
@@ -2,7 +2,7 @@ error[E0392]: parameter `T` is never used
   --> $DIR/issue-17904-2.rs:4:12
    |
 LL | struct Foo<T> where T: Copy;
-   |            ^ unused type parameter
+   |            ^ unused parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/issues/issue-20413.stderr b/src/test/ui/issues/issue-20413.stderr
@@ -2,7 +2,7 @@ error[E0392]: parameter `T` is never used
   --> $DIR/issue-20413.rs:5:15
    |
 LL | struct NoData<T>;
-   |               ^ unused type parameter
+   |               ^ unused parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/issues/issue-36299.stderr b/src/test/ui/issues/issue-36299.stderr
@@ -2,15 +2,15 @@ error[E0392]: parameter `'a` is never used
   --> $DIR/issue-36299.rs:1:12
    |
 LL | struct Foo<'a, A> {}
-   |            ^^ unused type parameter
+   |            ^^ unused parameter
    |
    = help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `A` is never used
   --> $DIR/issue-36299.rs:1:16
    |
 LL | struct Foo<'a, A> {}
-   |                ^ unused type parameter
+   |                ^ unused parameter
    |
    = help: consider removing `A` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/issues/issue-36638.stderr b/src/test/ui/issues/issue-36638.stderr
@@ -14,7 +14,7 @@ error[E0392]: parameter `Self` is never used
   --> $DIR/issue-36638.rs:3:12
    |
 LL | struct Foo<Self>(Self);
-   |            ^^^^ unused type parameter
+   |            ^^^^ unused parameter
    |
    = help: consider removing `Self` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/issues/issue-37534.stderr b/src/test/ui/issues/issue-37534.stderr
@@ -18,7 +18,7 @@ error[E0392]: parameter `T` is never used
   --> $DIR/issue-37534.rs:1:12
    |
 LL | struct Foo<T: ?Hash> { }
-   |            ^ unused type parameter
+   |            ^ unused parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr
@@ -25,7 +25,7 @@ error[E0392]: parameter `'c` is never used
   --> $DIR/region-bounds-on-objects-and-type-parameters.rs:11:18
    |
 LL | struct Foo<'a,'b,'c> {
-   |                  ^^ unused type parameter
+   |                  ^^ unused parameter
    |
    = help: consider removing `'c` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/self/self_type_keyword.stderr b/src/test/ui/self/self_type_keyword.stderr
@@ -62,7 +62,7 @@ error[E0392]: parameter `'Self` is never used
   --> $DIR/self_type_keyword.rs:8:12
    |
 LL | struct Bar<'Self>;
-   |            ^^^^^ unused type parameter
+   |            ^^^^^ unused parameter
    |
    = help: consider removing `'Self` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/variance/variance-regions-unused-direct.stderr b/src/test/ui/variance/variance-regions-unused-direct.stderr
@@ -2,15 +2,15 @@ error[E0392]: parameter `'a` is never used
   --> $DIR/variance-regions-unused-direct.rs:5:18
    |
 LL | struct Bivariant<'a>;
-   |                  ^^ unused type parameter
+   |                  ^^ unused parameter
    |
    = help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `'d` is never used
   --> $DIR/variance-regions-unused-direct.rs:7:19
    |
 LL | struct Struct<'a, 'd> {
-   |                   ^^ unused type parameter
+   |                   ^^ unused parameter
    |
    = help: consider removing `'d` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/variance/variance-regions-unused-indirect.stderr b/src/test/ui/variance/variance-regions-unused-indirect.stderr
@@ -2,15 +2,15 @@ error[E0392]: parameter `'a` is never used
   --> $DIR/variance-regions-unused-indirect.rs:3:10
    |
 LL | enum Foo<'a> {
-   |          ^^ unused type parameter
+   |          ^^ unused parameter
    |
    = help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `'a` is never used
   --> $DIR/variance-regions-unused-indirect.rs:7:10
    |
 LL | enum Bar<'a> {
-   |          ^^ unused type parameter
+   |          ^^ unused parameter
    |
    = help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/variance/variance-unused-region-param.stderr b/src/test/ui/variance/variance-unused-region-param.stderr
@@ -2,15 +2,15 @@ error[E0392]: parameter `'a` is never used
   --> $DIR/variance-unused-region-param.rs:3:19
    |
 LL | struct SomeStruct<'a> { x: u32 }
-   |                   ^^ unused type parameter
+   |                   ^^ unused parameter
    |
    = help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `'a` is never used
   --> $DIR/variance-unused-region-param.rs:4:15
    |
 LL | enum SomeEnum<'a> { Nothing }
-   |               ^^ unused type parameter
+   |               ^^ unused parameter
    |
    = help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
 
diff --git a/src/test/ui/variance/variance-unused-type-param.stderr b/src/test/ui/variance/variance-unused-type-param.stderr
@@ -2,23 +2,23 @@ error[E0392]: parameter `A` is never used
   --> $DIR/variance-unused-type-param.rs:6:19
    |
 LL | struct SomeStruct<A> { x: u32 }
-   |                   ^ unused type parameter
+   |                   ^ unused parameter
    |
    = help: consider removing `A` or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `A` is never used
   --> $DIR/variance-unused-type-param.rs:9:15
    |
 LL | enum SomeEnum<A> { Nothing }
-   |               ^ unused type parameter
+   |               ^ unused parameter
    |
    = help: consider removing `A` or using a marker such as `std::marker::PhantomData`
 
 error[E0392]: parameter `T` is never used
   --> $DIR/variance-unused-type-param.rs:13:15
    |
 LL | enum ListCell<T> {
-   |               ^ unused type parameter
+   |               ^ unused parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
 

Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0392]: parameter `T` is never used
`2`	`2`	`--> $DIR/E0392.rs:1:10`
`3`	`3`	`\|`
`4`	`4`	`LL \| enum Foo<T> { Bar }`
`5`		`- \| ^ unused type parameter`
	`5`	`+ \| ^ unused parameter`
`6`	`6`	`\|`
`7`	`7`	= help: consider removing `T` or using a marker such as `std::marker::PhantomData`
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ error[E0392]: parameter `T` is never used
`12`	`12`	`--> $DIR/inner-static-type-parameter.rs:3:10`
`13`	`13`	`\|`
`14`	`14`	`LL \| enum Bar<T> { What }`
`15`		`- \| ^ unused type parameter`
	`15`	`+ \| ^ unused parameter`
`16`	`16`	`\|`
`17`	`17`	= help: consider removing `T` or using a marker such as `std::marker::PhantomData`
`18`	`18`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0392]: parameter `T` is never used
`2`	`2`	`--> $DIR/issue-17904-2.rs:4:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct Foo<T> where T: Copy;`
`5`		`- \| ^ unused type parameter`
	`5`	`+ \| ^ unused parameter`
`6`	`6`	`\|`
`7`	`7`	= help: consider removing `T` or using a marker such as `std::marker::PhantomData`
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0392]: parameter `T` is never used
`2`	`2`	`--> $DIR/issue-20413.rs:5:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct NoData<T>;`
`5`		`- \| ^ unused type parameter`
	`5`	`+ \| ^ unused parameter`
`6`	`6`	`\|`
`7`	`7`	= help: consider removing `T` or using a marker such as `std::marker::PhantomData`
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,15 +2,15 @@ error[E0392]: parameter `'a` is never used
`2`	`2`	`--> $DIR/issue-36299.rs:1:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct Foo<'a, A> {}`
`5`		`- \| ^^ unused type parameter`
	`5`	`+ \| ^^ unused parameter`
`6`	`6`	`\|`
`7`	`7`	= help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
`8`	`8`
`9`	`9`	error[E0392]: parameter `A` is never used
`10`	`10`	`--> $DIR/issue-36299.rs:1:16`
`11`	`11`	`\|`
`12`	`12`	`LL \| struct Foo<'a, A> {}`
`13`		`- \| ^ unused type parameter`
	`13`	`+ \| ^ unused parameter`
`14`	`14`	`\|`
`15`	`15`	= help: consider removing `A` or using a marker such as `std::marker::PhantomData`
`16`	`16`
Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@ error[E0392]: parameter `Self` is never used
`14`	`14`	`--> $DIR/issue-36638.rs:3:12`
`15`	`15`	`\|`
`16`	`16`	`LL \| struct Foo<Self>(Self);`
`17`		`- \| ^^^^ unused type parameter`
	`17`	`+ \| ^^^^ unused parameter`
`18`	`18`	`\|`
`19`	`19`	= help: consider removing `Self` or using a marker such as `std::marker::PhantomData`
`20`	`20`
Original file line number	Diff line number	Diff line change
@@ -18,7 +18,7 @@ error[E0392]: parameter `T` is never used
`18`	`18`	`--> $DIR/issue-37534.rs:1:12`
`19`	`19`	`\|`
`20`	`20`	`LL \| struct Foo<T: ?Hash> { }`
`21`		`- \| ^ unused type parameter`
	`21`	`+ \| ^ unused parameter`
`22`	`22`	`\|`
`23`	`23`	= help: consider removing `T` or using a marker such as `std::marker::PhantomData`
`24`	`24`
Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ error[E0392]: parameter `'c` is never used
`25`	`25`	`--> $DIR/region-bounds-on-objects-and-type-parameters.rs:11:18`
`26`	`26`	`\|`
`27`	`27`	`LL \| struct Foo<'a,'b,'c> {`
`28`		`- \| ^^ unused type parameter`
	`28`	`+ \| ^^ unused parameter`
`29`	`29`	`\|`
`30`	`30`	= help: consider removing `'c` or using a marker such as `std::marker::PhantomData`
`31`	`31`
Original file line number	Diff line number	Diff line change
@@ -62,7 +62,7 @@ error[E0392]: parameter `'Self` is never used
`62`	`62`	`--> $DIR/self_type_keyword.rs:8:12`
`63`	`63`	`\|`
`64`	`64`	`LL \| struct Bar<'Self>;`
`65`		`- \| ^^^^^ unused type parameter`
	`65`	`+ \| ^^^^^ unused parameter`
`66`	`66`	`\|`
`67`	`67`	= help: consider removing `'Self` or using a marker such as `std::marker::PhantomData`
`68`	`68`
Original file line number	Diff line number	Diff line change
@@ -2,15 +2,15 @@ error[E0392]: parameter `'a` is never used
`2`	`2`	`--> $DIR/variance-regions-unused-direct.rs:5:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| struct Bivariant<'a>;`
`5`		`- \| ^^ unused type parameter`
	`5`	`+ \| ^^ unused parameter`
`6`	`6`	`\|`
`7`	`7`	= help: consider removing `'a` or using a marker such as `std::marker::PhantomData`
`8`	`8`
`9`	`9`	error[E0392]: parameter `'d` is never used
`10`	`10`	`--> $DIR/variance-regions-unused-direct.rs:7:19`
`11`	`11`	`\|`
`12`	`12`	`LL \| struct Struct<'a, 'd> {`
`13`		`- \| ^^ unused type parameter`
	`13`	`+ \| ^^ unused parameter`
`14`	`14`	`\|`
`15`	`15`	= help: consider removing `'d` or using a marker such as `std::marker::PhantomData`
`16`	`16`