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/rustdoc-ui/failed-doctest-output-windows.rs b/src/test/rustdoc-ui/failed-doctest-output-windows.rs
deleted file mode 100644
index 4cd9993d8..000000000
--- a/src/test/rustdoc-ui/failed-doctest-output-windows.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// only-windows
-// There's a parallel generic version of this test for non-windows platforms.
-
-// Issue #51162: A failed doctest was not printing its stdout/stderr
-// FIXME: if/when the output of the test harness can be tested on its own, this test should be
-// adapted to use that, and that normalize line can go away
-
-// compile-flags:--test --test-args --test-threads=1
-// rustc-env:RUST_BACKTRACE=0
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
-// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
-// failure-status: 101
-
-// doctest fails at runtime
-/// ```
-/// println!("stdout 1");
-/// eprintln!("stderr 1");
-/// println!("stdout 2");
-/// eprintln!("stderr 2");
-/// panic!("oh no");
-/// ```
-pub struct SomeStruct;
-
-// doctest fails at compile time
-/// ```
-/// no
-/// ```
-pub struct OtherStruct;