bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #99904 - GuillaumeGomez:cleanup-html-whitespace, r=notriddle

Browse source 
Cleanup html whitespace

I realized while looking at the raw HTML that we generated some unwanted white space characters. This PR cleans up the one coming directly from rustdoc. I'll check from `pulldown-cmark` for the remaining ones.

Some numbers now: the difference is small, it goes from `63009` to `62859`. But multiplied by the number of files, it becomes quite interesting overall.

r? `@notriddle`
This commit is contained in:
Yuki Okushi 2022-07-30 07:39:56 +09:00 • committed by GitHub
commit cfbf7be7d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustdoc/html/render/print_item.rs
View file

@ -311,7 +311,7 @@ fn item_module(w: &mut Buffer, cx: &mut Context<'_>, item: &clean::Item, items:
w,
"<h2 id=\"{id}\" class=\"small-section-header\">\
<a href=\"#{id}\">{name}</a>\
</h2>\n{}",
</h2>{}",
ITEM_TABLE_OPEN,
id = cx.derive_id(my_section.id().to_owned()),
name = my_section.name(),
@ -1126,7 +1126,8 @@ fn item_union(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean:
write!(
w,
"<h2 id=\"fields\" class=\"fields small-section-header\">\
Fields<a href=\"#fields\" class=\"anchor\"></a></h2>"
Fields<a href=\"#fields\" class=\"anchor\"></a>\
</h2>"
);
for (field, ty) in fields {
let name = field.name.expect("union field name");
@ -1238,7 +1239,8 @@ fn item_enum(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, e: &clean::
write!(
w,
"<h2 id=\"variants\" class=\"variants small-section-header\">\
Variants{}<a href=\"#variants\" class=\"anchor\"></a></h2>",
Variants{}<a href=\"#variants\" class=\"anchor\"></a>\
</h2>",
document_non_exhaustive_header(it)
);
document_non_exhaustive(w, it);

14
src/librustdoc/html/templates/page.html
View file

@ -82,10 +82,10 @@
{%- else -%}
<img class="rust-logo" src="{{static_root_path|safe}}rust-logo{{page.resource_suffix}}.svg" alt="logo"> {#- -#}
{%- endif -%}
</div>
</div> {#- -#}
</a> {#- -#}
<h2 class="location"></h2>
</nav>
<h2 class="location"></h2> {#- -#}
</nav> {#- -#}
<nav class="sidebar"> {#- -#}
<a class="sidebar-logo" href="{{page.root_path|safe}}{{krate_with_trailing_slash|safe}}index.html"> {#- -#}
<div class="logo-container"> {#- -#}
@ -94,7 +94,7 @@
{%- else -%}
<img class="rust-logo" src="{{static_root_path|safe}}rust-logo{{page.resource_suffix}}.svg" alt="logo"> {#- -#}
{%- endif -%}
</div>
</div> {#- -#}
</a> {#- -#}
{{- sidebar|safe -}}
</nav> {#- -#}
@ -122,12 +122,12 @@
<div id="help-button" title="help" tabindex="-1"> {#- -#}
<button type="button">?</button> {#- -#}
</div> {#- -#}
<div id="settings-menu" tabindex="-1">
<div id="settings-menu" tabindex="-1"> {#- -#}
<a href="{{page.root_path|safe}}settings.html" title="settings"> {#- -#}
<img width="22" height="22" alt="Change settings" {# -#}
src="{{static_root_path|safe}}wheel{{page.resource_suffix}}.svg"> {#- -#}
</a> {#- -#}
</div>
</div> {#- -#}
</div> {#- -#}
</form> {#- -#}
</nav> {#- -#}
@ -143,6 +143,6 @@
data-resource-suffix="{{page.resource_suffix}}" {# -#}
data-rustdoc-version="{{rustdoc_version}}" {# -#}
> {#- -#}
</div>
</div> {#- -#}
</body> {#- -#}
</html> {#- -#}

4
src/librustdoc/html/templates/print_item.html
View file

@ -1,4 +1,4 @@
<div class="main-heading">
<div class="main-heading"> {#- -#}
<h1 class="fqn"> {#- -#}
<span class="in-band"> {#- -#}
{{-typ-}}
@ -27,4 +27,4 @@
[<span class="inner">&#x2212;</span>] {#- -#}
</a> {#- -#}
</span> {#- -#}
</div>
</div> {#- -#}