mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly generate links in the sidebar for impls

Browse Source
This commit is contained in:
Guillaume Gomez 2022-02-27 12:07:38 +01:00
parent b8967b0d52
commit 7e0a2a765e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librustdoc/html/render/mod.rs
View File

@ -74,7 +74,7 @@
PrintWithSpace, PrintWithSpace,
}; };
use crate::html::highlight; use crate::html::highlight;
use crate::html::markdown::{HeadingOffset, Markdown, MarkdownHtml, MarkdownSummaryLine}; use crate::html::markdown::{HeadingOffset, IdMap, Markdown, MarkdownHtml, MarkdownSummaryLine};
use crate::html::sources; use crate::html::sources;
use crate::scrape_examples::{CallData, CallLocation}; use crate::scrape_examples::{CallData, CallLocation};
use crate::try_none; use crate::try_none;
@ -1950,8 +1950,10 @@ fn small_url_encode(s: String) -> String {
fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) { fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) {
let did = it.def_id.expect_def_id(); let did = it.def_id.expect_def_id();
let cache = cx.cache(); let cache = cx.cache();
if let Some(v) = cache.impls.get(&did) { if let Some(v) = cache.impls.get(&did) {
let mut used_links = FxHashSet::default(); let mut used_links = FxHashSet::default();
let mut id_map = IdMap::new();
{ {
let used_links_bor = &mut used_links; let used_links_bor = &mut used_links;
@ -1992,7 +1994,7 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) {
sidebar_deref_methods(cx, out, impl_, v, &mut derefs); sidebar_deref_methods(cx, out, impl_, v, &mut derefs);
} }
let format_impls = |impls: Vec<&Impl>| { let format_impls = |impls: Vec<&Impl>, id_map: &mut IdMap| {
let mut links = FxHashSet::default(); let mut links = FxHashSet::default();
let mut ret = impls let mut ret = impls
@ -2001,13 +2003,14 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) {
if let Some(ref i) = it.inner_impl().trait_ { if let Some(ref i) = it.inner_impl().trait_ {
let i_display = format!("{:#}", i.print(cx)); let i_display = format!("{:#}", i.print(cx));
let out = Escape(&i_display); let out = Escape(&i_display);
let encoded = small_url_encode(format!("{:#}", i.print(cx))); let encoded =
id_map.derive(small_url_encode(format!("impl-{:#}", i.print(cx))));
let prefix = match it.inner_impl().polarity { let prefix = match it.inner_impl().polarity {
ty::ImplPolarity::Positive | ty::ImplPolarity::Reservation => "", ty::ImplPolarity::Positive | ty::ImplPolarity::Reservation => "",
ty::ImplPolarity::Negative => "!", ty::ImplPolarity::Negative => "!",
}; };
let generated = let generated =
format!("<a href=\"#impl-{}\">{}{}</a>", encoded, prefix, out); format!("<a href=\"#{}\">{}{}</a>", encoded, prefix, out);
if links.insert(generated.clone()) { Some(generated) } else { None } if links.insert(generated.clone()) { Some(generated) } else { None }
} else { } else {
None None
@ -2023,9 +2026,9 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) {
let (blanket_impl, concrete): (Vec<&Impl>, Vec<&Impl>) = let (blanket_impl, concrete): (Vec<&Impl>, Vec<&Impl>) =
concrete.into_iter().partition::<Vec<_>, _>(|i| i.inner_impl().kind.is_blanket()); concrete.into_iter().partition::<Vec<_>, _>(|i| i.inner_impl().kind.is_blanket());
let concrete_format = format_impls(concrete); let concrete_format = format_impls(concrete, &mut id_map);
let synthetic_format = format_impls(synthetic); let synthetic_format = format_impls(synthetic, &mut id_map);
let blanket_format = format_impls(blanket_impl); let blanket_format = format_impls(blanket_impl, &mut id_map);
if !concrete_format.is_empty() { if !concrete_format.is_empty() {
print_sidebar_block( print_sidebar_block(