Rename book_location into book_source and add a new field to store the target location

Author: GuillaumeGomez

src/librustdoc/config.rs

@@ -321,8 +321,10 @@ pub(crate) struct RenderOptions {
     pub(crate) parts_out_dir: Option<PathToParts>,
     /// disable minification of CSS/JS
     pub(crate) disable_minification: bool,
-    /// Location where the associated book is located.
-    pub(crate) book_location: Option<PathOrUrl>,
+    /// Location where the associated book source is located.
+    pub(crate) book_source: Option<PathOrUrl>,
+    /// Location where the associated book is generated. None if it's not local.
+    pub(crate) book_target: Option<PathOrUrl>,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -826,7 +828,7 @@ impl Options {
             rustc_feature::UnstableFeatures::from_environment(crate_name.as_deref());
 
         let disable_minification = matches.opt_present("disable-minification");
-        let book_location = matches.opt_str("book-location").map(PathOrUrl::new);
+        let book_source = matches.opt_str("book-location").map(PathOrUrl::new);
 
         let options = Options {
             bin_crate,
@@ -905,7 +907,9 @@ impl Options {
             include_parts_dir,
             parts_out_dir,
             disable_minification,
-            book_location,
+            book_source,
+            // This field is updated in `generate_book`.
+            book_target: None,
         };
         Some((input, options, render_options))
     }

src/librustdoc/html/render/context.rs

@@ -146,7 +146,7 @@ pub(crate) struct SharedContext<'tcx> {
     /// Controls whether we read / write to cci files in the doc root. Defaults read=true,
     /// write=true
     should_merge: ShouldMerge,
-    pub(crate) book_location: Option<crate::config::PathOrUrl>,
+    pub(crate) book_target: Option<crate::config::PathOrUrl>,
 }
 
 impl SharedContext<'_> {
@@ -490,7 +490,7 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
             call_locations,
             no_emit_shared,
             html_no_source,
-            book_location,
+            book_target,
             ..
         } = options;
 
@@ -577,7 +577,7 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
             cache,
             call_locations,
             should_merge: options.should_merge,
-            book_location,
+            book_target,
         };
 
         let dst = output;
@@ -649,7 +649,7 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
             parent_is_crate: false,
             blocks: vec![blocks],
             path: String::new(),
-            book_location: shared.book_location.as_ref(),
+            book_location: shared.book_target.as_ref(),
         };
 
         bar.render_into(&mut sidebar).unwrap();

src/librustdoc/html/render/sidebar.rs

@@ -195,7 +195,7 @@ pub(super) fn print_sidebar(cx: &Context<'_>, it: &clean::Item, buffer: &mut Str
         parent_is_crate: sidebar_path.len() == 1,
         blocks,
         path,
-        book_location: cx.shared.book_location.as_ref(),
+        book_location: cx.shared.book_target.as_ref(),
     };
     sidebar.render_into(buffer).unwrap();
 }

src/librustdoc/lib.rs

@@ -758,8 +758,12 @@ fn run_renderer<'tcx, T: formats::FormatRenderer<'tcx>>(
 }
 
 fn generate_book(render_options: &mut config::RenderOptions) -> Result<(), String> {
-    let Some(config::PathOrUrl::Path(ref mut book_dir)) = render_options.book_location else {
-        return Ok(());
+    let book_dir = match &render_options.book_source {
+        Some(config::PathOrUrl::Path(book_dir)) => book_dir,
+        other => {
+            render_options.book_target = other.clone();
+            return Ok(());
+        }
     };
     if !book_dir.is_dir() {
         return Err(format!(
@@ -772,14 +776,15 @@ fn generate_book(render_options: &mut config::RenderOptions) -> Result<(), Strin
         Err(error) => return Err(format!("failed to load book: {error:?}")),
     };
     let output_dir = render_options.output.join("doc-book");
-    *book_dir = output_dir.join("index.html");
+    let book_target = output_dir.join("index.html");
     book.config.build.build_dir = output_dir;
     if let Err(error) = book.build() {
         return Err(format!(
             "failed to generate book into `{}`: {error:?}",
             book.config.build.build_dir.display()
         ));
     }
+    render_options.book_target = Some(config::PathOrUrl::Path(book_target));
     Ok(())
 }