diff options
| author | bors <bors@rust-lang.org> | 2021-06-23 06:19:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-23 06:19:21 +0000 |
| commit | 2ce052bb8d8e4b421f08541ffa1f4c7fc5ea7a72 (patch) | |
| tree | 6935154e59ed821cf032554d93540952754a5b2f /src | |
| parent | 8cb207ae69700de3e782eec5cc9013c0987b2519 (diff) | |
| parent | 093e2464455bd7fff614ff4c658f6a1eb5e7a89d (diff) | |
| download | rust-2ce052bb8d8e4b421f08541ffa1f4c7fc5ea7a72.tar.gz rust-2ce052bb8d8e4b421f08541ffa1f4c7fc5ea7a72.zip | |
Auto merge of #86564 - jsha:revert-83826, r=jyn514
Revert "List trait impls before methods from deref in the sidebar ..." This reverts commit 8a058926ecd6d0988714f8f7a5a31293c533f8c6. Fixes #85618 r? `@jyn514`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 03b607c2d2c..8c922240c44 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1887,6 +1887,14 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) { } if v.iter().any(|i| i.inner_impl().trait_.is_some()) { + if let Some(impl_) = v + .iter() + .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); + } + let format_impls = |impls: Vec<&Impl>| { let mut links = FxHashSet::default(); @@ -1954,14 +1962,6 @@ fn sidebar_assoc_items(cx: &Context<'_>, out: &mut Buffer, it: &clean::Item) { ); write_sidebar_links(out, blanket_format); } - - if let Some(impl_) = v - .iter() - .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); - } } } } |
