From 32dcff40b870bea300916658aa4e3db300810aa2 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Thu, 20 Oct 2022 21:03:40 -0700 Subject: [PATCH] If static.files directory is present, use that. --- src/docbuilder/rustwide_builder.rs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/docbuilder/rustwide_builder.rs b/src/docbuilder/rustwide_builder.rs index 47c7ab16d..ff63baa58 100644 --- a/src/docbuilder/rustwide_builder.rs +++ b/src/docbuilder/rustwide_builder.rs @@ -227,7 +227,23 @@ impl RustwideBuilder { .tempdir()?; copy_dir_all(source, &dest)?; - add_path_into_database(&self.storage, RUSTDOC_STATIC_STORAGE_PREFIX, &dest)?; + // One https://github.com/rust-lang/rust/pull/101702 lands, static files will be + // put in their own directory, "static.files". To make sure those files are + // available at --static-root-path, we add files from that subdirectory, if present. + let static_files = dest.as_ref().join("static.files"); + if static_files.try_exists()? { + add_path_into_database( + &self.storage, + RUSTDOC_STATIC_STORAGE_PREFIX, + &static_files, + )?; + } else { + add_path_into_database( + &self.storage, + RUSTDOC_STATIC_STORAGE_PREFIX, + &dest, + )?; + } set_config( &mut conn,