Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 27 deletions

diff --git a/src/test/ui/inference/erase-type-params-in-label.rs b/src/test/ui/inference/erase-type-params-in-label.rs
deleted file mode 100644
index 1fea2da92..000000000
--- a/src/test/ui/inference/erase-type-params-in-label.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-fn main() {
-    let foo = foo(1, ""); //~ ERROR E0283
-}
-fn baz() {
-    let bar = bar(1, ""); //~ ERROR E0283
-}
-
-struct Bar<T, K, N: Default> {
-    t: T,
-    k: K,
-    n: N,
-}
-
-fn bar<T, K, Z: Default>(t: T, k: K) -> Bar<T, K, Z> {
-    Bar { t, k, n: Default::default() }
-}
-
-struct Foo<T, K, N: Default, M: Default> {
-    t: T,
-    k: K,
-    n: N,
-    m: M,
-}
-
-fn foo<T, K, W: Default, Z: Default>(t: T, k: K) -> Foo<T, K, W, Z> {
-    Foo { t, k, n: Default::default(), m: Default::default() }
-}