Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

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

4 files changed, 14 insertions, 0 deletions

diff --git a/src/test/ui/qualified/qualified-path-params-2.rs b/tests/ui/qualified/qualified-path-params-2.rs
index d0cc1fa3d..d0cc1fa3d 100644
--- a/src/test/ui/qualified/qualified-path-params-2.rs
+++ b/tests/ui/qualified/qualified-path-params-2.rs
diff --git a/tests/ui/qualified/qualified-path-params-2.stderr b/tests/ui/qualified/qualified-path-params-2.stderr
new file mode 100644
index 000000000..b6cf19b82
--- /dev/null
+++ b/tests/ui/qualified/qualified-path-params-2.stderr
@@ -0,0 +1,14 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/qualified-path-params-2.rs:18:10
+   |
+LL | type A = <S as Tr>::A::f<u8>;
+   |          ^^^^^^^^^^^^^^^^^^^
+   |
+help: if there were a trait named `Example` with associated type `f` implemented for `<S as Tr>::A`, you could use the fully-qualified path
+   |
+LL | type A = <<S as Tr>::A as Example>::f;
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/qualified/qualified-path-params.rs b/tests/ui/qualified/qualified-path-params.rs
index e8a95a460..e8a95a460 100644
--- a/src/test/ui/qualified/qualified-path-params.rs
+++ b/tests/ui/qualified/qualified-path-params.rs
diff --git a/src/test/ui/qualified/qualified-path-params.stderr b/tests/ui/qualified/qualified-path-params.stderr
index a49ed6c8f..a49ed6c8f 100644
--- a/src/test/ui/qualified/qualified-path-params.stderr
+++ b/tests/ui/qualified/qualified-path-params.stderr