mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #99209 - GuillaumeGomez:crate-level-sidebar, r=jsha

Browse Source 
Correctly handle crate level page on docs.rs as well

Fixes #99121.

On docs.rs, they move the `class` attribute into a child which still has `rustdoc`. So instead of using the `<body>`, we can simply use this one directly.

r? `@jsha`
This commit is contained in:
Dylan DPC 2022-07-15 15:53:39 +05:30 committed by GitHub
commit 5c8c4dbce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustdoc/html/static/js/main.js
View File

@ -479,8 +479,6 @@ function loadCss(cssFileName) {
} }
if (sidebar) { if (sidebar) {
const isModule = hasClass(document.body, "mod");
if (!isModule) {
block("primitive", "primitives", "Primitive Types"); block("primitive", "primitives", "Primitive Types");
block("mod", "modules", "Modules"); block("mod", "modules", "Modules");
block("macro", "macros", "Macros"); block("macro", "macros", "Macros");
@ -497,7 +495,6 @@ function loadCss(cssFileName) {
block("traitalias", "trait-aliases", "Trait Aliases"); block("traitalias", "trait-aliases", "Trait Aliases");
} }
} }
}
window.register_implementors = imp => { window.register_implementors = imp => {
const implementors = document.getElementById("implementors-list"); const implementors = document.getElementById("implementors-list");

2
src/librustdoc/html/templates/page.html
View File

@ -39,7 +39,7 @@
{%- else if page.css_class == "source" -%} {%- else if page.css_class == "source" -%}
<script defer src="{{static_root_path|safe}}source-script{{page.resource_suffix}}.js"></script> {#- -#} <script defer src="{{static_root_path|safe}}source-script{{page.resource_suffix}}.js"></script> {#- -#}
<script defer src="{{page.root_path|safe}}source-files{{page.resource_suffix}}.js"></script> {#- -#} <script defer src="{{page.root_path|safe}}source-files{{page.resource_suffix}}.js"></script> {#- -#}
{%- else -%} {%- else if !page.css_class.contains("mod") -%}
<script defer src="sidebar-items{{page.resource_suffix}}.js"></script> {#- -#} <script defer src="sidebar-items{{page.resource_suffix}}.js"></script> {#- -#}
{%- endif -%} {%- endif -%}
<script defer src="{{static_root_path|safe}}main{{page.resource_suffix}}.js"></script> {#- -#} <script defer src="{{static_root_path|safe}}main{{page.resource_suffix}}.js"></script> {#- -#}