squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

fix rustdoc stack overflow on mutually recursive Deref

Browse source 
fix #85095
This commit is contained in:
Trinity Pointard 2021-06-15 11:47:17 +02:00
parent 9089771daf
commit aee50f417f
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/librustdoc/html/render/mod.rs
View file

@ -1960,13 +1960,19 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) {
.filter(|i| i.inner_impl().trait_.is_some())
.find(|i| i.inner_impl().trait_.def_id_full(cache) == cx.cache.deref_trait_did)
{
sidebar_deref_methods(cx, out, impl_, v);
sidebar_deref_methods(cx, out, impl_, v, FxHashSet::default());
}
}
}
}
fn sidebar_deref_methods(cx: &Context<'_>, out: &mut Buffer, impl_: &Impl, v: &Vec<Impl>) {
fn sidebar_deref_methods(
cx: &Context<'_>,
out: &mut Buffer,
impl_: &Impl,
v: &Vec<Impl>,
mut already_seen: FxHashSet<DefId>,
) {
let c = cx.cache();
debug!("found Deref: {:?}", impl_);
@ -2032,7 +2038,15 @@ fn sidebar_deref_methods(cx: &Context<'_>, out: &mut Buffer, impl_: &Impl, v: &V
.filter(|i| i.inner_impl().trait_.is_some())
.find(|i| i.inner_impl().trait_.def_id_full(c) == c.deref_trait_did)
{
sidebar_deref_methods(cx, out, target_deref_impl, target_impls);
if already_seen.insert(target_did.clone()) {
sidebar_deref_methods(
cx,
out,
target_deref_impl,
target_impls,
already_seen,
);
}
}
}
}

22
src/test/rustdoc/issue-85095.rs Normal file
View file

@ -0,0 +1,22 @@
use std::ops::Deref;
pub struct A;
pub struct B;
// @has issue_85095/struct.A.html '//code' 'impl Deref for A'
impl Deref for A {
type Target = B;
fn deref(&self) -> &Self::Target {
panic!()
}
}
// @has issue_85095/struct.B.html '//code' 'impl Deref for B'
impl Deref for B {
type Target = A;
fn deref(&self) -> &Self::Target {
panic!()
}
}