Sort sidebar implementations on foreign types with natural compare

Author: chenyukang

src/librustdoc/html/render/sidebar.rs

@@ -12,6 +12,7 @@ use crate::clean;
 use crate::formats::Impl;
 use crate::formats::item_type::ItemType;
 use crate::html::markdown::{IdMap, MarkdownWithToc};
+use crate::html::render::print_item::compare_names;
 
 #[derive(Clone, Copy)]
 pub(crate) enum ModuleLike {
@@ -297,7 +298,7 @@ fn sidebar_trait<'a>(
                 .filter_map(|i| super::extract_for_impl_name(&i.impl_item, cx))
                 .map(|(name, id)| Link::new(id, name)),
         );
-        foreign_impls.sort();
+        foreign_impls.sort_by(|a, b| compare_names(&a.name, &b.name));
     }
 
     blocks.extend(

tests/rustdoc-gui/sidebar-foreign-impl-sort.goml

@@ -0,0 +1,15 @@
+// Checks sidebar resizing close the Settings popover
+go-to: "file://" + |DOC_PATH| + "/test_docs/SidebarSort/trait.SidebarFoo.html#foreign-impls"
+
+// Check that the sidebar contains the expected foreign implementations
+assert-text: (".sidebar-elems section ul > li:nth-child(1)", "&'a str")
+assert-text: (".sidebar-elems section ul > li:nth-child(2)", "AtomicBool")
+assert-text: (".sidebar-elems section ul > li:nth-child(3)", "AtomicU8")
+assert-text: (".sidebar-elems section ul > li:nth-child(4)", "AtomicU16")
+assert-text: (".sidebar-elems section ul > li:nth-child(5)", "AtomicU32")
+assert-text: (".sidebar-elems section ul > li:nth-child(6)", "Cell<u8>")
+assert-text: (".sidebar-elems section ul > li:nth-child(7)", "Cell<u16>")
+assert-text: (".sidebar-elems section ul > li:nth-child(8)", "u8")
+assert-text: (".sidebar-elems section ul > li:nth-child(9)", "u16")
+assert-text: (".sidebar-elems section ul > li:nth-child(10)", "u32")
+assert-text: (".sidebar-elems section ul > li:nth-child(11)", "usize")

tests/rustdoc-gui/src/test_docs/lib.rs

@@ -713,3 +713,21 @@ pub trait ItemsTrait {
     /// blablala
     fn bar();
 }
+
+pub mod SidebarSort {
+    use std::cell::Cell;
+    use std::sync::atomic::*;
+    pub trait SidebarFoo {}
+
+    impl SidebarFoo for u32 {}
+    impl SidebarFoo for u8 {}
+    impl SidebarFoo for u16 {}
+    impl SidebarFoo for usize {}
+    impl SidebarFoo for AtomicU32 {}
+    impl SidebarFoo for AtomicU16 {}
+    impl SidebarFoo for AtomicU8 {}
+    impl SidebarFoo for AtomicBool {}
+    impl SidebarFoo for Cell<u16> {}
+    impl SidebarFoo for Cell<u8> {}
+    impl<'a> SidebarFoo for &'a str {}
+}