mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 07:14:28 +00:00
Auto merge of #86322 - trinity-1686a:rustdoc-fix-overflow-recursive-deref, r=jyn514
fix rustdoc stack overflow on mutually recursive Deref fix #85095 fix #85037
This commit is contained in:
commit
966361fe49
@ -1997,19 +1997,6 @@ fn sidebar_deref_methods(cx: &Context<'_>, out: &mut Buffer, impl_: &Impl, v: &V
|
||||
out.push_str("</div>");
|
||||
}
|
||||
}
|
||||
|
||||
// Recurse into any further impls that might exist for `target`
|
||||
if let Some(target_did) = target.def_id_full(c) {
|
||||
if let Some(target_impls) = c.impls.get(&target_did) {
|
||||
if let Some(target_deref_impl) = target_impls
|
||||
.iter()
|
||||
.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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
22
src/test/rustdoc/recursive-deref-sidebar.rs
Normal file
22
src/test/rustdoc/recursive-deref-sidebar.rs
Normal file
@ -0,0 +1,22 @@
|
||||
use std::ops::Deref;
|
||||
|
||||
pub struct A {}
|
||||
impl A { pub fn foo_a(&self) {} }
|
||||
|
||||
pub struct B {}
|
||||
impl B { pub fn foo_b(&self) {} }
|
||||
|
||||
pub struct C {}
|
||||
impl C { pub fn foo_c(&self) {} }
|
||||
|
||||
// @has recursive_deref_sidebar/struct.A.html '//div[@class="sidebar-links"]' 'foo_b'
|
||||
impl Deref for A {
|
||||
type Target = B;
|
||||
fn deref(&self) -> &B { todo!() }
|
||||
}
|
||||
|
||||
// @!has recursive_deref_sidebar/struct.A.html '//div[@class="sidebar-links"]' 'foo_c'
|
||||
impl Deref for B {
|
||||
type Target = C;
|
||||
fn deref(&self) -> &C { todo!() }
|
||||
}
|
22
src/test/rustdoc/recursive-deref.rs
Normal file
22
src/test/rustdoc/recursive-deref.rs
Normal file
@ -0,0 +1,22 @@
|
||||
use std::ops::Deref;
|
||||
|
||||
pub struct A;
|
||||
pub struct B;
|
||||
|
||||
// @has recursive_deref/struct.A.html '//code' 'impl Deref for A'
|
||||
impl Deref for A {
|
||||
type Target = B;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
panic!()
|
||||
}
|
||||
}
|
||||
|
||||
// @has recursive_deref/struct.B.html '//code' 'impl Deref for B'
|
||||
impl Deref for B {
|
||||
type Target = A;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
panic!()
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user