Rollup merge of #98012 - compiler-errors:poly-trait-refs-are-traits, r=cjgillot

Dylan-DPC · web-flow · commit 5ffc46403490 · 2022-06-12T11:24:41.000+02:00
`ValuePairs::PolyTraitRefs` should be called "trait"s in type error diagnostics

Pretty simple, we already do this for `ValuePairs::TraitRefs`...
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@@ -1588,7 +1588,9 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                             Mismatch::Variable(infer::ExpectedFound { expected, found }),
                         )
                     }
-                    ValuePairs::TraitRefs(_) => (false, Mismatch::Fixed("trait")),
+                    ValuePairs::TraitRefs(_) | ValuePairs::PolyTraitRefs(_) => {
+                        (false, Mismatch::Fixed("trait"))
+                    }
                     _ => (false, Mismatch::Fixed("type")),
                 };
                 let vals = match self.values_str(values) {
diff --git a/src/test/ui/generator/resume-arg-late-bound.stderr b/src/test/ui/generator/resume-arg-late-bound.stderr
@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL |     test(gen);
    |     ^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'a> Generator<&'a mut bool>`
-              found type `Generator<&mut bool>`
+   = note: expected trait `for<'a> Generator<&'a mut bool>`
+              found trait `Generator<&mut bool>`
 note: the lifetime requirement is introduced here
   --> $DIR/resume-arg-late-bound.rs:8:17
    |
diff --git a/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.stderr b/src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.stderr
@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL |     foo(bar, "string", |s| s.len() == 5);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'r, 's> FnOnce<(&'r &'s str,)>`
-              found type `for<'r> FnOnce<(&'r &str,)>`
+   = note: expected trait `for<'r, 's> FnOnce<(&'r &'s str,)>`
+              found trait `for<'r> FnOnce<(&'r &str,)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/issue-71955.rs:45:24
    |
@@ -23,8 +23,8 @@ error[E0308]: mismatched types
 LL |     foo(bar, "string", |s| s.len() == 5);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `FnOnce<(&&str,)>`
-              found type `for<'r> FnOnce<(&'r &str,)>`
+   = note: expected trait `FnOnce<(&&str,)>`
+              found trait `for<'r> FnOnce<(&'r &str,)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/issue-71955.rs:45:24
    |
@@ -42,8 +42,8 @@ error[E0308]: mismatched types
 LL |     foo(baz, "string", |s| s.0.len() == 5);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'r, 's> FnOnce<(&'r Wrapper<'s>,)>`
-              found type `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
+   = note: expected trait `for<'r, 's> FnOnce<(&'r Wrapper<'s>,)>`
+              found trait `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/issue-71955.rs:48:24
    |
@@ -61,8 +61,8 @@ error[E0308]: mismatched types
 LL |     foo(baz, "string", |s| s.0.len() == 5);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `FnOnce<(&Wrapper<'_>,)>`
-              found type `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
+   = note: expected trait `FnOnce<(&Wrapper<'_>,)>`
+              found trait `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/issue-71955.rs:48:24
    |
diff --git a/src/test/ui/issues/issue-27942.stderr b/src/test/ui/issues/issue-27942.stderr
@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL |     fn select(&self) -> BufferViewHandle<R>;
    |                         ^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected type `Resources<'_>`
-              found type `Resources<'a>`
+   = note: expected trait `Resources<'_>`
+              found trait `Resources<'a>`
 note: the anonymous lifetime defined here...
   --> $DIR/issue-27942.rs:5:15
    |
@@ -23,8 +23,8 @@ error[E0308]: mismatched types
 LL |     fn select(&self) -> BufferViewHandle<R>;
    |                         ^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
-   = note: expected type `Resources<'_>`
-              found type `Resources<'a>`
+   = note: expected trait `Resources<'_>`
+              found trait `Resources<'a>`
 note: the lifetime `'a` as defined here...
   --> $DIR/issue-27942.rs:3:18
    |
diff --git a/src/test/ui/lifetimes/issue-79187-2.stderr b/src/test/ui/lifetimes/issue-79187-2.stderr
@@ -31,8 +31,8 @@ error[E0308]: mismatched types
 LL |     take_foo(|a| a);
    |     ^^^^^^^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'r> Fn<(&'r i32,)>`
-              found type `Fn<(&i32,)>`
+   = note: expected trait `for<'r> Fn<(&'r i32,)>`
+              found trait `Fn<(&i32,)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/issue-79187-2.rs:8:14
    |
diff --git a/src/test/ui/lifetimes/issue-79187.stderr b/src/test/ui/lifetimes/issue-79187.stderr
@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL |     thing(f);
    |     ^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'r> FnOnce<(&'r u32,)>`
-              found type `FnOnce<(&u32,)>`
+   = note: expected trait `for<'r> FnOnce<(&'r u32,)>`
+              found trait `FnOnce<(&u32,)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/issue-79187.rs:4:13
    |
diff --git a/src/test/ui/lifetimes/lifetime-errors/issue_74400.stderr b/src/test/ui/lifetimes/lifetime-errors/issue_74400.stderr
@@ -15,8 +15,8 @@ error[E0308]: mismatched types
 LL |     f(data, identity)
    |     ^^^^^^^^^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'r> Fn<(&'r T,)>`
-              found type `Fn<(&T,)>`
+   = note: expected trait `for<'r> Fn<(&'r T,)>`
+              found trait `Fn<(&T,)>`
 note: the lifetime requirement is introduced here
   --> $DIR/issue_74400.rs:8:34
    |
diff --git a/src/test/ui/mismatched_types/closure-mismatch.stderr b/src/test/ui/mismatched_types/closure-mismatch.stderr
@@ -13,8 +13,8 @@ error[E0308]: mismatched types
 LL |     baz(|_| ());
    |     ^^^^^^^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'r> Fn<(&'r (),)>`
-              found type `Fn<(&(),)>`
+   = note: expected trait `for<'r> Fn<(&'r (),)>`
+              found trait `Fn<(&(),)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/closure-mismatch.rs:8:9
    |
diff --git a/src/test/ui/rfc1623.stderr b/src/test/ui/rfc1623.stderr
@@ -4,17 +4,17 @@ error[E0308]: mismatched types
 LL |     f: &id,
    |        ^^^ one type is more general than the other
    |
-   = note: expected type `for<'a, 'b> Fn<(&'a Foo<'b>,)>`
-              found type `Fn<(&Foo<'_>,)>`
+   = note: expected trait `for<'a, 'b> Fn<(&'a Foo<'b>,)>`
+              found trait `Fn<(&Foo<'_>,)>`
 
 error[E0308]: mismatched types
   --> $DIR/rfc1623.rs:28:8
    |
 LL |     f: &id,
    |        ^^^ one type is more general than the other
    |
-   = note: expected type `for<'a, 'b> Fn<(&'a Foo<'b>,)>`
-              found type `Fn<(&Foo<'_>,)>`
+   = note: expected trait `for<'a, 'b> Fn<(&'a Foo<'b>,)>`
+              found trait `Fn<(&Foo<'_>,)>`
 
 error: implementation of `FnOnce` is not general enough
   --> $DIR/rfc1623.rs:28:8
diff --git a/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.stderr b/src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.stderr
@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL |         |x| x
    |         ^^^^^ one type is more general than the other
    |
-   = note: expected type `for<'r> Fn<(&'r X,)>`
-              found type `Fn<(&X,)>`
+   = note: expected trait `for<'r> Fn<(&'r X,)>`
+              found trait `Fn<(&X,)>`
 note: this closure does not fulfill the lifetime requirements
   --> $DIR/issue-57611-trait-alias.rs:21:9
    |

Original file line number	Diff line number	Diff line change
`@@ -1588,7 +1588,9 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {`
`1588`	`1588`	`Mismatch::Variable(infer::ExpectedFound { expected, found }),`
`1589`	`1589`	`)`
`1590`	`1590`	`}`
`1591`		`- ValuePairs::TraitRefs(_) => (false, Mismatch::Fixed("trait")),`
	`1591`	`+ ValuePairs::TraitRefs(_) \| ValuePairs::PolyTraitRefs(_) => {`
	`1592`	`+ (false, Mismatch::Fixed("trait"))`
	`1593`	`+ }`
`1592`	`1594`	`_ => (false, Mismatch::Fixed("type")),`
`1593`	`1595`	`};`
`1594`	`1596`	`let vals = match self.values_str(values) {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ error[E0308]: mismatched types`
`4`	`4`	`LL \| test(gen);`
`5`	`5`	`\| ^^^^^^^^^ one type is more general than the other`
`6`	`6`	`\|`
`7`		- = note: expected type `for<'a> Generator<&'a mut bool>`
`8`		- found type `Generator<&mut bool>`
	`7`	+ = note: expected trait `for<'a> Generator<&'a mut bool>`
	`8`	+ found trait `Generator<&mut bool>`
`9`	`9`	`note: the lifetime requirement is introduced here`
`10`	`10`	`--> $DIR/resume-arg-late-bound.rs:8:17`
`11`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ error[E0308]: mismatched types`
`4`	`4`	`LL \| foo(bar, "string", \|s\| s.len() == 5);`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other`
`6`	`6`	`\|`
`7`		- = note: expected type `for<'r, 's> FnOnce<(&'r &'s str,)>`
`8`		- found type `for<'r> FnOnce<(&'r &str,)>`
	`7`	+ = note: expected trait `for<'r, 's> FnOnce<(&'r &'s str,)>`
	`8`	+ found trait `for<'r> FnOnce<(&'r &str,)>`
`9`	`9`	`note: this closure does not fulfill the lifetime requirements`
`10`	`10`	`--> $DIR/issue-71955.rs:45:24`
`11`	`11`	`\|`
`@@ -23,8 +23,8 @@ error[E0308]: mismatched types`
`23`	`23`	`LL \| foo(bar, "string", \|s\| s.len() == 5);`
`24`	`24`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other`
`25`	`25`	`\|`
`26`		- = note: expected type `FnOnce<(&&str,)>`
`27`		- found type `for<'r> FnOnce<(&'r &str,)>`
	`26`	+ = note: expected trait `FnOnce<(&&str,)>`
	`27`	+ found trait `for<'r> FnOnce<(&'r &str,)>`
`28`	`28`	`note: this closure does not fulfill the lifetime requirements`
`29`	`29`	`--> $DIR/issue-71955.rs:45:24`
`30`	`30`	`\|`
`@@ -42,8 +42,8 @@ error[E0308]: mismatched types`
`42`	`42`	`LL \| foo(baz, "string", \|s\| s.0.len() == 5);`
`43`	`43`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other`
`44`	`44`	`\|`
`45`		- = note: expected type `for<'r, 's> FnOnce<(&'r Wrapper<'s>,)>`
`46`		- found type `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
	`45`	+ = note: expected trait `for<'r, 's> FnOnce<(&'r Wrapper<'s>,)>`
	`46`	+ found trait `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
`47`	`47`	`note: this closure does not fulfill the lifetime requirements`
`48`	`48`	`--> $DIR/issue-71955.rs:48:24`
`49`	`49`	`\|`
`@@ -61,8 +61,8 @@ error[E0308]: mismatched types`
`61`	`61`	`LL \| foo(baz, "string", \|s\| s.0.len() == 5);`
`62`	`62`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other`
`63`	`63`	`\|`
`64`		- = note: expected type `FnOnce<(&Wrapper<'_>,)>`
`65`		- found type `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
	`64`	+ = note: expected trait `FnOnce<(&Wrapper<'_>,)>`
	`65`	+ found trait `for<'r> FnOnce<(&'r Wrapper<'_>,)>`
`66`	`66`	`note: this closure does not fulfill the lifetime requirements`
`67`	`67`	`--> $DIR/issue-71955.rs:48:24`
`68`	`68`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ error[E0308]: mismatched types`
`4`	`4`	`LL \| fn select(&self) -> BufferViewHandle<R>;`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^ lifetime mismatch`
`6`	`6`	`\|`
`7`		- = note: expected type `Resources<'_>`
`8`		- found type `Resources<'a>`
	`7`	+ = note: expected trait `Resources<'_>`
	`8`	+ found trait `Resources<'a>`
`9`	`9`	`note: the anonymous lifetime defined here...`
`10`	`10`	`--> $DIR/issue-27942.rs:5:15`
`11`	`11`	`\|`
`@@ -23,8 +23,8 @@ error[E0308]: mismatched types`
`23`	`23`	`LL \| fn select(&self) -> BufferViewHandle<R>;`
`24`	`24`	`\| ^^^^^^^^^^^^^^^^^^^ lifetime mismatch`
`25`	`25`	`\|`
`26`		- = note: expected type `Resources<'_>`
`27`		- found type `Resources<'a>`
	`26`	+ = note: expected trait `Resources<'_>`
	`27`	+ found trait `Resources<'a>`
`28`	`28`	note: the lifetime `'a` as defined here...
`29`	`29`	`--> $DIR/issue-27942.rs:3:18`
`30`	`30`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ error[E0308]: mismatched types`
`31`	`31`	`LL \| take_foo(\|a\| a);`
`32`	`32`	`\| ^^^^^^^^^^^^^^^ one type is more general than the other`
`33`	`33`	`\|`
`34`		- = note: expected type `for<'r> Fn<(&'r i32,)>`
`35`		- found type `Fn<(&i32,)>`
	`34`	+ = note: expected trait `for<'r> Fn<(&'r i32,)>`
	`35`	+ found trait `Fn<(&i32,)>`
`36`	`36`	`note: this closure does not fulfill the lifetime requirements`
`37`	`37`	`--> $DIR/issue-79187-2.rs:8:14`
`38`	`38`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ error[E0308]: mismatched types`
`4`	`4`	`LL \| thing(f);`
`5`	`5`	`\| ^^^^^^^^ one type is more general than the other`
`6`	`6`	`\|`
`7`		- = note: expected type `for<'r> FnOnce<(&'r u32,)>`
`8`		- found type `FnOnce<(&u32,)>`
	`7`	+ = note: expected trait `for<'r> FnOnce<(&'r u32,)>`
	`8`	+ found trait `FnOnce<(&u32,)>`
`9`	`9`	`note: this closure does not fulfill the lifetime requirements`
`10`	`10`	`--> $DIR/issue-79187.rs:4:13`
`11`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ error[E0308]: mismatched types`
`15`	`15`	`LL \| f(data, identity)`
`16`	`16`	`\| ^^^^^^^^^^^^^^^^^ one type is more general than the other`
`17`	`17`	`\|`
`18`		- = note: expected type `for<'r> Fn<(&'r T,)>`
`19`		- found type `Fn<(&T,)>`
	`18`	+ = note: expected trait `for<'r> Fn<(&'r T,)>`
	`19`	+ found trait `Fn<(&T,)>`
`20`	`20`	`note: the lifetime requirement is introduced here`
`21`	`21`	`--> $DIR/issue_74400.rs:8:34`
`22`	`22`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ error[E0308]: mismatched types`
`13`	`13`	`LL \| baz(\|_\| ());`
`14`	`14`	`\| ^^^^^^^^^^^ one type is more general than the other`
`15`	`15`	`\|`
`16`		- = note: expected type `for<'r> Fn<(&'r (),)>`
`17`		- found type `Fn<(&(),)>`
	`16`	+ = note: expected trait `for<'r> Fn<(&'r (),)>`
	`17`	+ found trait `Fn<(&(),)>`
`18`	`18`	`note: this closure does not fulfill the lifetime requirements`
`19`	`19`	`--> $DIR/closure-mismatch.rs:8:9`
`20`	`20`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ error[E0308]: mismatched types`
`4`	`4`	`LL \| \|x\| x`
`5`	`5`	`\| ^^^^^ one type is more general than the other`
`6`	`6`	`\|`
`7`		- = note: expected type `for<'r> Fn<(&'r X,)>`
`8`		- found type `Fn<(&X,)>`
	`7`	+ = note: expected trait `for<'r> Fn<(&'r X,)>`
	`8`	+ found trait `Fn<(&X,)>`
`9`	`9`	`note: this closure does not fulfill the lifetime requirements`
`10`	`10`	`--> $DIR/issue-57611-trait-alias.rs:21:9`
`11`	`11`	`\|`