Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 23 deletions

diff --git a/src/test/ui/specialization/specialization-overlap-hygiene.rs b/src/test/ui/specialization/specialization-overlap-hygiene.rs
deleted file mode 100644
index 93e7c8325..000000000
--- a/src/test/ui/specialization/specialization-overlap-hygiene.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-#![feature(decl_macro)]
-
-struct X;
-
-macro_rules! define_f_legacy { () => {
-    fn f() {}
-}}
-macro define_g_modern() {
-    fn g() {}
-}
-
-impl X {
-   fn f() {} //~ ERROR duplicate definitions with name `f`
-   fn g() {} // OK
-}
-impl X {
-    define_f_legacy!();
-}
-impl X {
-    define_g_modern!();
-}
-
-fn main() {}