Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 53 deletions

diff --git a/src/test/ui/inherent-impls-overlap-check/no-overlap.rs b/src/test/ui/inherent-impls-overlap-check/no-overlap.rs
deleted file mode 100644
index 450e6d420..000000000
--- a/src/test/ui/inherent-impls-overlap-check/no-overlap.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// run-pass
-// aux-build:repeat.rs
-
-// This tests the allocating algo branch of the
-// inherent impls overlap checker.
-// This branch was added by PR:
-// https://github.com/rust-lang/rust/pull/78317
-// In this test, we repeat many impl blocks
-// to trigger the allocating branch.
-
-#![allow(unused)]
-
-extern crate repeat;
-
-// Simple case where each impl block is distinct
-
-struct Foo {}
-
-repeat::repeat_with_idents!(impl Foo { fn IDENT() {} });
-
-// There are overlapping impl blocks but due to generics,
-// they may overlap.
-
-struct Bar<T>(T);
-
-struct A;
-struct B;
-
-repeat::repeat_with_idents!(impl Bar<A> { fn IDENT() {} });
-
-impl Bar<A> { fn foo() {} }
-impl Bar<B> { fn foo() {} }
-
-// Regression test for issue #89820:
-
-impl Bar<u8> {
-    pub fn a() {}
-    pub fn aa() {}
-}
-
-impl Bar<u16> {
-    pub fn b() {}
-    pub fn bb() {}
-}
-
-impl Bar<u32> {
-    pub fn a() {}
-    pub fn aa() {}
-    pub fn bb() {}
-    pub fn b() {}
-}
-
-fn main() {}