Skip to content

Commit

Permalink
Merge pull request torvalds#575 from ojeda/css-fix-drop
Browse files Browse the repository at this point in the history
rust: docs: remove temporary CSS fix
  • Loading branch information
ojeda authored Nov 29, 2021
2 parents fbb7b1a + 30154cd commit 7ea794f
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions rust/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,8 @@ quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $<
--output $(objtree)/rust/doc --crate-name $(subst rustdoc-,,$@) \
@$(objtree)/include/generated/rustc_cfg $<

# This is a temporary fix for the CSS, visible on `type`s (`Result`).
# It is already fixed in nightly.
RUSTDOC_FIX_BEFORE := .impl,.method,.type:not(.container-rustdoc),.associatedconstant,.associatedtype
RUSTDOC_FIX_AFTER := .impl,.impl-items .method,.methods .method,.impl-items \
.type,.methods .type,.impl-items .associatedconstant,.methods \
.associatedconstant,.impl-items .associatedtype,.methods .associatedtype

rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins rustdoc-alloc rustdoc-kernel
$(Q)cp $(srctree)/Documentation/rust/assets/* $(objtree)/rust/doc
$(Q)sed -i "s/$(RUSTDOC_FIX_BEFORE)/$(RUSTDOC_FIX_AFTER)/" \
$(objtree)/rust/doc/rustdoc.css

rustdoc-macros: private rustdoc_host = yes
rustdoc-macros: private rustc_target_flags = --crate-type proc-macro \
Expand Down

0 comments on commit 7ea794f

Please sign in to comment.