Merging upstream version 1.68.2+dfsg1.

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

7 files changed, 0 insertions, 85 deletions

diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs b/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs
deleted file mode 100644
index 1aa23c608..000000000
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// check-pass
-
-trait Usizer {
-    fn m(self) -> usize;
-}
-
-fn f<const N: usize>(u: impl Usizer) -> usize {
-    N + u.m()
-}
-
-struct Usizable;
-
-impl Usizer for Usizable {
-    fn m(self) -> usize {
-        16
-    }
-}
-
-fn main() {
-    assert_eq!(f::<4usize>(Usizable), 20usize);
-}
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.rs b/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.rs
deleted file mode 100644
index 3b1024d61..000000000
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn foo<T: ?Sized>(_f: impl AsRef<T>) {}
-
-fn main() {
-    foo::<str, String>("".to_string()); //~ ERROR E0107
-}
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr b/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr
deleted file mode 100644
index c8b82783e..000000000
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args-for-impl.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0107]: this function takes 1 generic argument but 2 generic arguments were supplied
-  --> $DIR/explicit-generic-args-for-impl.rs:4:5
-   |
-LL |     foo::<str, String>("".to_string());
-   |     ^^^        ------ help: remove this generic argument
-   |     |
-   |     expected 1 generic argument
-   |
-note: function defined here, with 1 generic parameter: `T`
-  --> $DIR/explicit-generic-args-for-impl.rs:1:4
-   |
-LL | fn foo<T: ?Sized>(_f: impl AsRef<T>) {}
-   |    ^^^ -
-   = note: `impl Trait` cannot be explicitly specified as a generic argument
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args.rs b/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args.rs
deleted file mode 100644
index 99e0931ab..000000000
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/explicit-generic-args.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// check-pass
-
-fn foo<T: ?Sized>(_f: impl AsRef<T>) {}
-
-fn main() {
-    foo::<str>("".to_string());
-}
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs b/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs
deleted file mode 100644
index 987df4997..000000000
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// check-pass
-
-fn f<T: ?Sized>(_: impl AsRef<T>, _: impl AsRef<T>) {}
-
-fn main() {
-    f::<[u8]>("a", b"a");
-}
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.rs b/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.rs
deleted file mode 100644
index 7249a36f5..000000000
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-fn f<T: ?Sized, U: ?Sized>(_: impl AsRef<T>, _: impl AsRef<U>) {}
-
-fn main() {
-    f::<[u8]>("a", b"a");
-    //~^ ERROR: this function takes 2 generic arguments but 1 generic argument was supplied
-}
diff --git a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.stderr b/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.stderr
deleted file mode 100644
index 9d6db88d3..000000000
--- a/src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/not-enough-args.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0107]: this function takes 2 generic arguments but 1 generic argument was supplied
-  --> $DIR/not-enough-args.rs:4:5
-   |
-LL |     f::<[u8]>("a", b"a");
-   |     ^   ---- supplied 1 generic argument
-   |     |
-   |     expected 2 generic arguments
-   |
-note: function defined here, with 2 generic parameters: `T`, `U`
-  --> $DIR/not-enough-args.rs:1:4
-   |
-LL | fn f<T: ?Sized, U: ?Sized>(_: impl AsRef<T>, _: impl AsRef<U>) {}
-   |    ^ -          -
-help: add missing generic argument
-   |
-LL |     f::<[u8], U>("a", b"a");
-   |             +++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0107`.