Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/generic-associated-types/generic-associated-types-where.stderr b/tests/ui/generic-associated-types/generic-associated-types-where.stderr
new file mode 100644
index 000000000..9a745c099
--- /dev/null
+++ b/tests/ui/generic-associated-types/generic-associated-types-where.stderr
@@ -0,0 +1,25 @@
+error[E0277]: `T` doesn't implement `std::fmt::Display`
+  --> $DIR/generic-associated-types-where.rs:18:22
+   |
+LL |     type Assoc2<T> = Vec<T>;
+   |                      ^^^^^^ `T` cannot be formatted with the default formatter
+   |
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+help: consider restricting type parameter `T`
+   |
+LL |     type Assoc2<T: std::fmt::Display> = Vec<T>;
+   |                  +++++++++++++++++++
+
+error[E0276]: impl has stricter requirements than trait
+  --> $DIR/generic-associated-types-where.rs:20:38
+   |
+LL |     type Assoc3<T>;
+   |     -------------- definition of `Assoc3` from trait
+...
+LL |     type Assoc3<T> = Vec<T> where T: Iterator;
+   |                                      ^^^^^^^^ impl has extra requirement `T: Iterator`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0276, E0277.
+For more information about an error, try `rustc --explain E0276`.