1 files changed, 0 insertions, 45 deletions
diff --git a/testing/source/rust/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch b/testing/source/rust/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch
deleted file mode 100644
index e36e17275..000000000
--- a/testing/source/rust/67b5990472e3cac643d8cf90f45fe42201ddec3c.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 67b5990472e3cac643d8cf90f45fe42201ddec3c Mon Sep 17 00:00:00 2001
-From: jyn <github@jyn.dev>
-Date: Mon, 10 Jul 2023 15:59:30 -0500
-Subject: [PATCH] Revert "Fix `x test lint-docs` when download-rustc is
- enabled"
-
-This was not the correct fix. The problem was two-fold:
-- `download-rustc` didn't respect `llvm.assertions`
-- `rust-dev` was missing a bump to `download-ci-llvm-stamp`
-
-The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`.
----
- src/tools/lint-docs/src/groups.rs | 1 -
- src/tools/lint-docs/src/lib.rs    | 6 ------
- 2 files changed, 7 deletions(-)
-
-diff --git a/src/tools/lint-docs/src/groups.rs b/src/tools/lint-docs/src/groups.rs
-index b11fb287cf4dd..5be8ef7996bb2 100644
---- a/src/tools/lint-docs/src/groups.rs
-+++ b/src/tools/lint-docs/src/groups.rs
-@@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> {
-     fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> {
-         let mut result = BTreeMap::new();
-         let mut cmd = Command::new(self.rustc_path);
--        cmd.env_remove("LD_LIBRARY_PATH");
-         cmd.arg("-Whelp");
-         let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?;
-         if !output.status.success() {
-diff --git a/src/tools/lint-docs/src/lib.rs b/src/tools/lint-docs/src/lib.rs
-index fe29b9abda39a..b7c8b9ed2e318 100644
---- a/src/tools/lint-docs/src/lib.rs
-+++ b/src/tools/lint-docs/src/lib.rs
-@@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> {
-         fs::write(&tempfile, source)
-             .map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?;
-         let mut cmd = Command::new(self.rustc_path);
--        // NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself.
--        // Unfortunately, lint-docs is a bootstrap tool while rustc is built from source,
--        // and sometimes the paths conflict. In particular, when using `download-rustc`,
--        // the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`.
--        // Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler.
--        cmd.env_remove("LD_LIBRARY_PATH");
-         if options.contains(&"edition2015") {
-             cmd.arg("--edition=2015");
-         } else {