Rollup merge of #137106 - chenyukang:yukang-fix-sidebar-sort, r=notriddle
Add customized compare for Link in rustdoc Maybe some other types in sidebar need to be sorted in this way, maybe add this crate `natord` is ok? r? clubby789 Fixes #137098
This commit is contained in:
commit
8ccfd06e46
3 changed files with 50 additions and 1 deletions
|
|
@ -1,4 +1,5 @@
|
|||
use std::borrow::Cow;
|
||||
use std::cmp::Ordering;
|
||||
|
||||
use rinja::Template;
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
|
|
@ -12,6 +13,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 {
|
||||
|
|
@ -77,7 +79,7 @@ impl<'a> LinkBlock<'a> {
|
|||
}
|
||||
|
||||
/// A link to an item. Content should not be escaped.
|
||||
#[derive(PartialOrd, Ord, PartialEq, Eq, Hash, Clone)]
|
||||
#[derive(Ord, PartialEq, Eq, Hash, Clone)]
|
||||
pub(crate) struct Link<'a> {
|
||||
/// The content for the anchor tag and title attr
|
||||
name: Cow<'a, str>,
|
||||
|
|
@ -89,6 +91,20 @@ pub(crate) struct Link<'a> {
|
|||
children: Vec<Link<'a>>,
|
||||
}
|
||||
|
||||
impl PartialOrd for Link<'_> {
|
||||
fn partial_cmp(&self, other: &Link<'_>) -> Option<Ordering> {
|
||||
match compare_names(&self.name, &other.name) {
|
||||
Ordering::Equal => (),
|
||||
result => return Some(result),
|
||||
}
|
||||
(&self.name_html, &self.href, &self.children).partial_cmp(&(
|
||||
&other.name_html,
|
||||
&other.href,
|
||||
&other.children,
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Link<'a> {
|
||||
pub fn new(href: impl Into<Cow<'a, str>>, name: impl Into<Cow<'a, str>>) -> Self {
|
||||
Self { href: href.into(), name: name.into(), children: vec![], name_html: None }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue