Skip to content

Commit 5aa40dd

Browse files
Rollup merge of rust-lang#85175 - GuillaumeGomez:rustdoc-cleanup, r=jsha
Rustdoc cleanup Part of rust-lang#83332. The goal of this PR is to remove a few unused things: * The "loading content" things are now unneeded. * Some toggle CSS rules were still there. * Some parts of the JS had a different indent, fixed it. r? `@jsha`
2 parents 3db335b + cb91c6f commit 5aa40dd

File tree

8 files changed

+150
-274
lines changed

8 files changed

+150
-274
lines changed

Diff for: src/librustdoc/html/render/print_item.rs

+8-15
Original file line numberDiff line numberDiff line change
@@ -573,10 +573,6 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
573573
)
574574
}
575575

576-
fn write_loading_content(w: &mut Buffer, extra_content: &str) {
577-
write!(w, "{}<span class=\"loading-content\">Loading content...</span>", extra_content)
578-
}
579-
580576
fn trait_item(w: &mut Buffer, cx: &Context<'_>, m: &clean::Item, t: &clean::Item) {
581577
let name = m.name.as_ref().unwrap();
582578
info!("Documenting {} on {:?}", name, t.name);
@@ -601,7 +597,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
601597
for t in types {
602598
trait_item(w, cx, t, it);
603599
}
604-
write_loading_content(w, "</div>");
600+
w.write_str("</div>");
605601
}
606602

607603
if !consts.is_empty() {
@@ -614,7 +610,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
614610
for t in consts {
615611
trait_item(w, cx, t, it);
616612
}
617-
write_loading_content(w, "</div>");
613+
w.write_str("</div>");
618614
}
619615

620616
// Output the documentation for each function individually
@@ -628,7 +624,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
628624
for m in required {
629625
trait_item(w, cx, m, it);
630626
}
631-
write_loading_content(w, "</div>");
627+
w.write_str("</div>");
632628
}
633629
if !provided.is_empty() {
634630
write_small_section_header(
@@ -640,7 +636,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
640636
for m in provided {
641637
trait_item(w, cx, m, it);
642638
}
643-
write_loading_content(w, "</div>");
639+
w.write_str("</div>");
644640
}
645641

646642
// If there are methods directly on this trait object, render them here.
@@ -703,7 +699,6 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
703699
&[],
704700
);
705701
}
706-
write_loading_content(w, "");
707702
}
708703

709704
write_small_section_header(
@@ -715,7 +710,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
715710
for implementor in concrete {
716711
render_implementor(cx, implementor, it, w, &implementor_dups, &[]);
717712
}
718-
write_loading_content(w, "</div>");
713+
w.write_str("</div>");
719714

720715
if t.is_auto {
721716
write_small_section_header(
@@ -734,7 +729,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
734729
&collect_paths_for_type(implementor.inner_impl().for_.clone(), &cx.cache),
735730
);
736731
}
737-
write_loading_content(w, "</div>");
732+
w.write_str("</div>");
738733
}
739734
} else {
740735
// even without any implementations to write in, we still want the heading and list, so the
@@ -743,18 +738,16 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
743738
w,
744739
"implementors",
745740
"Implementors",
746-
"<div class=\"item-list\" id=\"implementors-list\">",
741+
"<div class=\"item-list\" id=\"implementors-list\"></div>",
747742
);
748-
write_loading_content(w, "</div>");
749743

750744
if t.is_auto {
751745
write_small_section_header(
752746
w,
753747
"synthetic-implementors",
754748
"Auto implementors",
755-
"<div class=\"item-list\" id=\"synthetic-implementors-list\">",
749+
"<div class=\"item-list\" id=\"synthetic-implementors-list\"></div>",
756750
);
757-
write_loading_content(w, "</div>");
758751
}
759752
}
760753

0 commit comments

Comments
 (0)