Skip to content

Commit cfd9672

Browse files
committed
rust: docs: fix logo replacement
The static files placement by `rustdoc` changed in Rust 1.67.0 [1], but the custom code we have to replace the logo in the generated HTML files did not get updated. Thus update it to have the Linux logo again in the output. Hopefully `rustdoc` will eventually support a custom logo from a local file [2], so that we do not need to maintain this hack on our side. Link: rust-lang/rust#101702 [1] Link: rust-lang/rfcs#3226 [2] Fixes: 3ed03f4 ("rust: upgrade to Rust 1.68.2") Cc: [email protected] Tested-by: Benno Lossin <[email protected]> Reviewed-by: Andreas Hindborg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 1db773d commit cfd9672

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

rust/Makefile

+7-8
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,14 @@ quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $<
9393
# and then retouch the generated files.
9494
rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins \
9595
rustdoc-alloc rustdoc-kernel
96-
$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)
97-
$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)
96+
$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)/static.files/
97+
$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)/static.files/
9898
$(Q)find $(rustdoc_output) -name '*.html' -type f -print0 | xargs -0 sed -Ei \
99-
-e 's:rust-logo\.svg:logo.svg:g' \
100-
-e 's:rust-logo\.png:logo.svg:g' \
101-
-e 's:favicon\.svg:logo.svg:g' \
102-
-e 's:<link rel="alternate icon" type="image/png" href="[./]*favicon-(16x16|32x32)\.png">::g'
103-
$(Q)echo '.logo-container > img { object-fit: contain; }' \
104-
>> $(rustdoc_output)/rustdoc.css
99+
-e 's:rust-logo-[0-9a-f]+\.svg:logo.svg:g' \
100+
-e 's:favicon-[0-9a-f]+\.svg:logo.svg:g' \
101+
-e 's:<link rel="alternate icon" type="image/png" href="[/.]+/static\.files/favicon-(16x16|32x32)-[0-9a-f]+\.png">::g'
102+
$(Q)for f in $(rustdoc_output)/static.files/rustdoc-*.css; do \
103+
echo ".logo-container > img { object-fit: contain; }" >> $$f; done
105104

106105
rustdoc-macros: private rustdoc_host = yes
107106
rustdoc-macros: private rustc_target_flags = --crate-type proc-macro \

0 commit comments

Comments
 (0)