Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/ui/rfc-2632-const-trait-impl/assoc-type.stderr b/tests/ui/rfc-2632-const-trait-impl/assoc-type.stderr
new file mode 100644
index 000000000..89177b0f1
--- /dev/null
+++ b/tests/ui/rfc-2632-const-trait-impl/assoc-type.stderr
@@ -0,0 +1,21 @@
+error[E0277]: cannot add `NonConstAdd` to `NonConstAdd` in const contexts
+  --> $DIR/assoc-type.rs:19:16
+   |
+LL |     type Bar = NonConstAdd;
+   |                ^^^^^^^^^^^ no implementation for `NonConstAdd + NonConstAdd`
+   |
+   = help: the trait `~const Add` is not implemented for `NonConstAdd`
+note: the trait `Add` is implemented for `NonConstAdd`, but that implementation is not `const`
+  --> $DIR/assoc-type.rs:19:16
+   |
+LL |     type Bar = NonConstAdd;
+   |                ^^^^^^^^^^^
+note: required by a bound in `Foo::Bar`
+  --> $DIR/assoc-type.rs:15:15
+   |
+LL |     type Bar: ~const std::ops::Add;
+   |               ^^^^^^^^^^^^^^^^^^^^ required by this bound in `Foo::Bar`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.