Simplify the sorting of impls and use CSS classes instead of plain JS to show/hide implementors

Author: GuillaumeGomez

src/librustdoc/html/render/print_item.rs

@@ -650,18 +650,18 @@ fn item_function(cx: &Context<'_>, it: &clean::Item, f: &clean::Function) -> imp
 ///
 /// This marker appears once in all trait impl lists to divide negative impls from positive impls.
 struct NegativeMarker {
-    inserted_negative_marker: bool,
+    inserted: bool,
 }
 
 impl NegativeMarker {
     fn new() -> Self {
-        Self { inserted_negative_marker: false }
+        Self { inserted: false }
     }
 
     fn insert_if_needed(&mut self, w: &mut fmt::Formatter<'_>, implementor: &Impl) -> fmt::Result {
-        if !self.inserted_negative_marker && !implementor.is_negative_trait_impl() {
-            write!(w, "<div class=\"negative-marker\"></div>")?;
-            self.inserted_negative_marker = true;
+        if !self.inserted && !implementor.is_negative_trait_impl() {
+            w.write_str("<div class=\"negative-marker\"></div>")?;
+            self.inserted = true;
         }
         Ok(())
     }

src/librustdoc/html/render/write_shared.rs

@@ -747,7 +747,14 @@ impl TraitAliasPart {
             path.push(format!("{remote_item_type}.{}.js", remote_path[remote_path.len() - 1]));
 
             let mut implementors = implementors.collect::<Vec<_>>();
-            implementors.sort_unstable();
+            implementors.sort_unstable_by(|a, b| {
+                // We sort negative impls first.
+                match (a.is_negative, b.is_negative) {
+                    (false, true) => Ordering::Greater,
+                    (true, false) => Ordering::Less,
+                    _ => compare_names(&a.text, &b.text),
+                }
+            });
 
             let part = OrderedJson::array_unsorted(
                 implementors
@@ -762,7 +769,6 @@ impl TraitAliasPart {
     }
 }
 
-#[derive(Eq)]
 struct Implementor {
     text: String,
     synthetic: bool,
@@ -786,29 +792,6 @@ impl Serialize for Implementor {
     }
 }
 
-impl PartialEq for Implementor {
-    fn eq(&self, other: &Self) -> bool {
-        self.cmp(other) == Ordering::Equal
-    }
-}
-
-impl PartialOrd for Implementor {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(Ord::cmp(self, other))
-    }
-}
-
-impl Ord for Implementor {
-    fn cmp(&self, other: &Self) -> Ordering {
-        // We sort negative impls first.
-        match (self.is_negative, other.is_negative) {
-            (false, true) => Ordering::Greater,
-            (true, false) => Ordering::Less,
-            _ => compare_names(&self.text, &other.text),
-        }
-    }
-}
-
 /// Collect the list of aliased types and their aliases.
 /// <https://github.com/search?q=repo%3Arust-lang%2Frust+[RUSTDOCIMPL]+type.impl&type=code>
 ///

src/librustdoc/html/static/css/noscript.css

@@ -29,7 +29,7 @@ nav.sub {
 	display: none;
 }
 
-#synthetic-implementors-list, #implementors-list {
+#synthetic-implementors-list:not(.loaded), #implementors-list:not(.loaded) {
 	display: block;
 }
 

src/librustdoc/html/static/css/rustdoc.css

@@ -1158,7 +1158,7 @@ div.where {
 	margin-left: calc(var(--docblock-indent) + var(--impl-items-indent));
 }
 
-#synthetic-implementors-list, #implementors-list {
+#synthetic-implementors-list:not(.loaded), #implementors-list:not(.loaded) {
 	/* To prevent layout shift when loading the page with extra implementors being loaded
 	   from JS, we hide the list until it's complete. */
 	display: none;

src/librustdoc/html/static/js/main.js

@@ -911,10 +911,10 @@ function preLoadCss(cssUrl) {
             }
         }
         if (implementors[0]) {
-            implementors[0].style.display = "block";
+            implementors[0].classList.add("loaded");
         }
         if (syntheticImplementors[0]) {
-            syntheticImplementors[0].style.display = "block";
+            syntheticImplementors[0].classList.add("loaded");
         }
     };
     if (window.pending_implementors) {