Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 46 deletions

diff --git a/src/test/ui/traits/default-method/rustc_must_implement_one_of_misuse.rs b/src/test/ui/traits/default-method/rustc_must_implement_one_of_misuse.rs
deleted file mode 100644
index 1f896da94..000000000
--- a/src/test/ui/traits/default-method/rustc_must_implement_one_of_misuse.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-#![feature(rustc_attrs)]
-
-#[rustc_must_implement_one_of(a, b)]
-//~^ Function not found in this trait
-//~| Function not found in this trait
-trait Tr0 {}
-
-#[rustc_must_implement_one_of(a, b)]
-//~^ Function not found in this trait
-trait Tr1 {
-    fn a() {}
-}
-
-#[rustc_must_implement_one_of(a)]
-//~^ the `#[rustc_must_implement_one_of]` attribute must be used with at least 2 args
-trait Tr2 {
-    fn a() {}
-}
-
-#[rustc_must_implement_one_of]
-//~^ malformed `rustc_must_implement_one_of` attribute input
-trait Tr3 {}
-
-#[rustc_must_implement_one_of(A, B)]
-trait Tr4 {
-    const A: u8 = 1; //~ Not a function
-
-    type B; //~ Not a function
-}
-
-#[rustc_must_implement_one_of(a, b)]
-trait Tr5 {
-    fn a(); //~ This function doesn't have a default implementation
-
-    fn b(); //~ This function doesn't have a default implementation
-}
-
-#[rustc_must_implement_one_of(abc, xyz)]
-//~^ attribute should be applied to a trait
-fn function() {}
-
-#[rustc_must_implement_one_of(abc, xyz)]
-//~^ attribute should be applied to a trait
-struct Struct {}
-
-fn main() {}