Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-32323.stderr b/tests/ui/issues/issue-32323.stderr
new file mode 100644
index 000000000..8212c607e
--- /dev/null
+++ b/tests/ui/issues/issue-32323.stderr
@@ -0,0 +1,18 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-32323.rs:5:30
+   |
+LL | pub fn f<'a, T: Tr<'a>>() -> <T as Tr<'a>>::Out {}
+   |        -                     ^^^^^^^^^^^^^^^^^^ expected associated type, found `()`
+   |        |
+   |        implicitly returns `()` as its body has no tail or `return` expression
+   |
+   = note: expected associated type `<T as Tr<'a>>::Out`
+                    found unit type `()`
+help: consider constraining the associated type `<T as Tr<'a>>::Out` to `()`
+   |
+LL | pub fn f<'a, T: Tr<'a, Out = ()>>() -> <T as Tr<'a>>::Out {}
+   |                      ++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.