Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 23 deletions

diff --git a/src/test/rustdoc-ui/run-directory.rs b/src/test/rustdoc-ui/run-directory.rs
deleted file mode 100644
index 0d432c1e6..000000000
--- a/src/test/rustdoc-ui/run-directory.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// this test asserts that the cwd of doctest invocations is set correctly.
-
-// revisions: correct incorrect
-// check-pass
-// [correct]compile-flags:--test --test-run-directory={{src-base}} -Zunstable-options
-// [incorrect]compile-flags:--test --test-run-directory={{src-base}}/coverage -Zunstable-options
-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
-// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
-
-/// ```
-/// assert_eq!(
-///     std::fs::read_to_string("run-directory.rs").unwrap(),
-///     include_str!("run-directory.rs"),
-/// );
-/// ```
-#[cfg(correct)]
-pub fn foo() {}
-
-/// ```
-/// assert!(std::fs::read_to_string("run-directory.rs").is_err());
-/// ```
-#[cfg(incorrect)]
-pub fn foo() {}