Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/librustdoc/html/render/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2023,19 +2023,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);
}
}
}
}
}

Expand Down
22 changes: 22 additions & 0 deletions src/test/rustdoc/recursive-deref-sidebar.rs
Original file line number Diff line number Diff line change
@@ -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 changes: 22 additions & 0 deletions src/test/rustdoc/recursive-deref.rs
Original file line number Diff line number Diff line change
@@ -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!()
}
}