Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 31 deletions

diff --git a/src/test/rustdoc-ui/cfg-test.rs b/src/test/rustdoc-ui/cfg-test.rs
deleted file mode 100644
index d4ca92585..000000000
--- a/src/test/rustdoc-ui/cfg-test.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// check-pass
-// compile-flags:--test --test-args --test-threads=1
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
-// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
-
-// Crates like core have doctests gated on `cfg(not(test))` so we need to make
-// sure `cfg(test)` is not active when running `rustdoc --test`.
-
-/// this doctest will be ignored:
-///
-/// ```
-/// assert!(false);
-/// ```
-#[cfg(test)]
-pub struct Foo;
-
-/// this doctest will be tested:
-///
-/// ```
-/// assert!(true);
-/// ```
-#[cfg(not(test))]
-pub struct Foo;
-
-/// this doctest will be tested, but will not appear in documentation:
-///
-/// ```
-/// assert!(true)
-/// ```
-#[cfg(doctest)]
-pub struct Bar;