Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/test/ui/sanitize/cfg.rs b/src/test/ui/sanitize/cfg.rs
deleted file mode 100644
index 79dfe58f0..000000000
--- a/src/test/ui/sanitize/cfg.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Verifies that when compiling with -Zsanitizer=option,
-// the `#[cfg(sanitize = "option")]` attribute is configured.
-
-// needs-sanitizer-support
-// needs-sanitizer-address
-// needs-sanitizer-leak
-// needs-sanitizer-memory
-// needs-sanitizer-thread
-// check-pass
-// revisions: address leak memory thread
-//[address]compile-flags: -Zsanitizer=address --cfg address
-//[leak]compile-flags:    -Zsanitizer=leak    --cfg leak
-//[memory]compile-flags:  -Zsanitizer=memory  --cfg memory
-//[thread]compile-flags:  -Zsanitizer=thread  --cfg thread
-
-#![feature(cfg_sanitize)]
-
-#[cfg(all(sanitize = "address", address))]
-fn main() {}
-
-#[cfg(all(sanitize = "leak", leak))]
-fn main() {}
-
-#[cfg(all(sanitize = "memory", memory))]
-fn main() {}
-
-#[cfg(all(sanitize = "thread", thread))]
-fn main() {}