Migrate changes for ExternArgs from root to crates mdbook-core and mdbook-driver.

Author: bobhy

Cargo.lock

@@ -27,6 +27,7 @@ rust-version = "1.88.0" # Keep in sync with installation.md and .github/workflow
 [workspace.dependencies]
 anyhow = "1.0.100"
 axum = "0.8.6"
+cargo-manifest = "0.19.1"
 clap = { version = "4.5.51", features = ["cargo", "wrap_help"] }
 clap_complete = "4.5.60"
 ego-tree = "0.10.0"

Cargo.toml

@@ -9,6 +9,7 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow.workspace = true
+cargo-manifest.workspace = true
 regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true

crates/mdbook-core/Cargo.toml

@@ -1,14 +1,14 @@
 //! Get "compiler" args from cargo
 
 use crate::errors::*;
-use anyhow::anyhow;
+use anyhow::{Context, anyhow, bail};
 use cargo_manifest::{Edition, Manifest, MaybeInherited::Local};
-use log::{debug, info};
 use std::fs;
 use std::fs::File;
 use std::io::prelude::*;
 use std::path::{Path, PathBuf};
 use std::process::Command;
+use tracing::{debug, info};
 
 /// Get the arguments needed to invoke rustc so it can find external crates
 /// when invoked by rustdoc to compile doctests.
@@ -23,8 +23,8 @@ use std::process::Command;
 /// Example:
 /// ```rust
 ///
-/// use mdbook::utils::extern_args::ExternArgs;
-/// # use mdbook::errors::*;
+/// use mdbook_core::utils::extern_args::ExternArgs;
+/// # use mdbook_core::errors::*;
 ///
 /// # fn main() -> Result<()> {
 /// // Get cargo to say what the compiler args need to be...
@@ -86,7 +86,7 @@ impl ExternArgs {
             .expect("doctest Cargo.toml must include a [package] section");
 
         self.crate_name = package.name.replace('-', "_"); // maybe cargo shouldn't allow packages to include non-identifier characters?
-                                                          // in any case, this won't work when default crate doesn't have package name (which I'm sure cargo allows somehow or another)
+        // in any case, this won't work when default crate doesn't have package name (which I'm sure cargo allows somehow or another)
         self.edition = if let Some(Local(edition)) = package.edition {
             my_display_edition(edition)
         } else {
@@ -174,7 +174,8 @@ impl ExternArgs {
                                 if dep_arg.ends_with(".rmeta") {
                                     debug!(
                                         "Build referenced {}, converted to .rlib hoping that actual file will be there in time.",
-                                        dep_arg);
+                                        dep_arg
+                                    );
                                     dep_arg = dep_arg.replace(".rmeta", ".rlib");
                                 }
                                 self.extern_list.push(dep_arg);
@@ -200,7 +201,9 @@ impl ExternArgs {
         }
 
         if self.extern_list.is_empty() || self.lib_list.is_empty() {
-            bail!("Couldn't extract -L or --extern args from Cargo, is current directory == cargo project root?");
+            bail!(
+                "Couldn't extract -L or --extern args from Cargo, is current directory == cargo project root?"
+            );
         }
 
         debug!(

crates/mdbook-core/src/utils/extern_args.rs

@@ -4,6 +4,7 @@ use anyhow::Error;
 use std::fmt::Write;
 use tracing::error;
 
+pub mod extern_args;
 pub mod fs;
 mod html;
 mod toml_ext;

crates/mdbook-core/src/utils/mod.rs

@@ -8,7 +8,7 @@ use anyhow::{Context, Error, Result, bail};
 use indexmap::IndexMap;
 use mdbook_core::book::{Book, BookItem, BookItems};
 use mdbook_core::config::{Config, RustEdition};
-use mdbook_core::utils::fs;
+use mdbook_core::utils::{extern_args, fs};
 use mdbook_html::HtmlHandlebars;
 use mdbook_preprocessor::{Preprocessor, PreprocessorContext};
 use mdbook_renderer::{RenderContext, Renderer};
@@ -271,6 +271,13 @@ impl MDBook {
         let (book, _) = self.preprocess_book(&TestRenderer)?;
 
         let color_output = std::io::stderr().is_terminal();
+        // get extra args we'll need for rustdoc, if config points to a cargo project
+
+        let mut extern_args = extern_args::ExternArgs::new();
+        if let Some(manifest) = &self.config.rust.manifest {
+            extern_args.load(&self.root.join(manifest))?;
+        }
+
         let mut failed = false;
         for item in book.iter() {
             if let BookItem::Chapter(ref ch) = *item {
@@ -298,7 +305,8 @@ impl MDBook {
                 cmd.current_dir(temp_dir.path())
                     .arg(chapter_path)
                     .arg("--test")
-                    .args(&library_args);
+                    .args(&library_args)
+                    .args(extern_args.get_args());
 
                 if let Some(edition) = self.config.rust.edition {
                     match edition {