Skip to content

Commit fbd9b62

Browse files
ojedagregkh
authored andcommitted
rust: docs: fix logo replacement
[ Upstream commit cfd9672 ] 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]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 43d2ca7 commit fbd9b62

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

rust/Makefile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,14 @@ quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $<
8585
# and then retouch the generated files.
8686
rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins \
8787
rustdoc-alloc rustdoc-kernel
88-
$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)
89-
$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)
88+
$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)/static.files/
89+
$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)/static.files/
9090
$(Q)find $(rustdoc_output) -name '*.html' -type f -print0 | xargs -0 sed -Ei \
91-
-e 's:rust-logo\.svg:logo.svg:g' \
92-
-e 's:rust-logo\.png:logo.svg:g' \
93-
-e 's:favicon\.svg:logo.svg:g' \
94-
-e 's:<link rel="alternate icon" type="image/png" href="[./]*favicon-(16x16|32x32)\.png">::g'
95-
$(Q)echo '.logo-container > img { object-fit: contain; }' \
96-
>> $(rustdoc_output)/rustdoc.css
91+
-e 's:rust-logo-[0-9a-f]+\.svg:logo.svg:g' \
92+
-e 's:favicon-[0-9a-f]+\.svg:logo.svg:g' \
93+
-e 's:<link rel="alternate icon" type="image/png" href="[/.]+/static\.files/favicon-(16x16|32x32)-[0-9a-f]+\.png">::g'
94+
$(Q)for f in $(rustdoc_output)/static.files/rustdoc-*.css; do \
95+
echo ".logo-container > img { object-fit: contain; }" >> $$f; done
9796

9897
rustdoc-macros: private rustdoc_host = yes
9998
rustdoc-macros: private rustc_target_flags = --crate-type proc-macro \

0 commit comments

Comments
 (0)