Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 50 deletions

diff --git a/src/test/ui/cfg/cfg_attr.rs b/src/test/ui/cfg/cfg_attr.rs
deleted file mode 100644
index c959e68ac..000000000
--- a/src/test/ui/cfg/cfg_attr.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// run-pass
-// compile-flags:--cfg set1 --cfg set2
-#![allow(dead_code)]
-use std::fmt::Debug;
-
-struct NotDebugable;
-
-#[cfg_attr(set1, derive(Debug))]
-struct Set1;
-
-#[cfg_attr(notset, derive(Debug))]
-struct Notset(NotDebugable);
-
-#[cfg_attr(not(notset), derive(Debug))]
-struct NotNotset;
-
-#[cfg_attr(not(set1), derive(Debug))]
-struct NotSet1(NotDebugable);
-
-#[cfg_attr(all(set1, set2), derive(Debug))]
-struct AllSet1Set2;
-
-#[cfg_attr(all(set1, notset), derive(Debug))]
-struct AllSet1Notset(NotDebugable);
-
-#[cfg_attr(any(set1, notset), derive(Debug))]
-struct AnySet1Notset;
-
-#[cfg_attr(any(notset, notset2), derive(Debug))]
-struct AnyNotsetNotset2(NotDebugable);
-
-#[cfg_attr(all(not(notset), any(set1, notset)), derive(Debug))]
-struct Complex;
-
-#[cfg_attr(any(notset, not(any(set1, notset))), derive(Debug))]
-struct ComplexNot(NotDebugable);
-
-#[cfg_attr(any(target_endian = "little", target_endian = "big"), derive(Debug))]
-struct KeyValue;
-
-fn is_show<T: Debug>() {}
-
-fn main() {
-    is_show::<Set1>();
-    is_show::<NotNotset>();
-    is_show::<AllSet1Set2>();
-    is_show::<AnySet1Notset>();
-    is_show::<Complex>();
-    is_show::<KeyValue>();
-}