Simplify dependency arguments

Author: GuillaumeGomez

src/librustdoc/doctest.rs

@@ -18,7 +18,7 @@ use std::{panic, str};
 
 pub(crate) use make::{BuildDocTestBuilder, DocTestBuilder};
 pub(crate) use markdown::test as test_markdown;
-use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxHasher, FxIndexMap, FxIndexSet};
+use rustc_data_structures::fx::{FxHashMap, FxHasher, FxIndexMap, FxIndexSet};
 use rustc_errors::emitter::HumanReadableErrorType;
 use rustc_errors::{ColorConfig, DiagCtxtHandle};
 use rustc_hir as hir;
@@ -589,22 +589,11 @@ fn compile_merged_doctest_and_caller_binary(
         format!("doctest_bundle_{edition}", edition = doctest.edition)
     };
 
-    // Deduplicate passed -L directory paths, since usually all dependencies will be in the
-    // same directory (e.g. target/debug/deps from Cargo).
-    let mut seen_search_dirs = FxHashSet::default();
+    for lib_str in &rustdoc_options.lib_strs {
+        runner_compiler.arg(format!("-L{lib_str}"));
+    }
     for extern_str in &rustdoc_options.extern_strs {
-        if let Some((_cratename, path)) = extern_str.split_once('=') {
-            // Direct dependencies of the tests themselves are
-            // indirect dependencies of the test runner.
-            // They need to be in the library search path.
-            let dir = Path::new(path)
-                .parent()
-                .filter(|x| x.components().count() > 0)
-                .unwrap_or(Path::new("."));
-            if seen_search_dirs.insert(dir) {
-                runner_compiler.arg("-L").arg(dir);
-            }
-        }
+        runner_compiler.arg(format!("--extern={extern_str}"));
     }
     let output_bundle_file = doctest.test_opts.outdir.path().join(format!("lib{base_name}.rlib"));
     let mut extern_path = std::ffi::OsString::from(format!("--extern={base_name}="));