diff options
| author | bors <bors@rust-lang.org> | 2022-09-01 22:12:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-01 22:12:32 +0000 |
| commit | 10706d62da83c4ec215165bc72df46219536648f (patch) | |
| tree | 56447cae81680c661c794e470279f32f9dbf7f8a /src/librustdoc/html/render/mod.rs | |
| parent | 2e35f954ada0f0c777844dc4fa66684efe90a035 (diff) | |
| parent | 1c12dedd5382804b6ea289e36969340194f8d44c (diff) | |
Auto merge of #101295 - matthiaskrgr:rollup-046o38p, r=matthiaskrgr
Rollup of 14 pull requests
Successful merges:
- #94467 (Add `special_module_name` lint)
- #100852 (Use `getuid` to check instead of `USER` env var in rustbuild)
- #101072 (bootstrap: Add llvm-has-rust-patches target option)
- #101190 (Make docs formulation more consistent for NonZero{int})
- #101245 (Remove unneeded where whitespace)
- #101251 (Fix bad target name in Walkthrough)
- #101254 (rustdoc: remove unused `.docblock .impl-items` CSS)
- #101256 (Fixes/adjustments to Fuchsia doc walkthrough)
- #101270 (Update outdated comment about output capturing in print_to.)
- #101271 (Fix filename of armv4t-none-eabi.md)
- #101274 (Fix typo in comment)
- #101279 (Fix doc_auto_cfg for impl blocks in different modules with different `cfg`)
- #101285 (Do not suggest adding `move` to closure when `move` is already used)
- #101292 (rustdoc: remove unneeded CSS `.content table td:first-child > a`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html/render/mod.rs')
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index eff34047e3c..7577c719623 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1737,8 +1737,8 @@ pub(crate) fn render_impl_summary( // in documentation pages for trait with automatic implementations like "Send" and "Sync". aliases: &[String], ) { - let id = - cx.derive_id(get_id_for_impl(&i.inner_impl().for_, i.inner_impl().trait_.as_ref(), cx)); + let inner_impl = i.inner_impl(); + let id = cx.derive_id(get_id_for_impl(&inner_impl.for_, inner_impl.trait_.as_ref(), cx)); let aliases = if aliases.is_empty() { String::new() } else { @@ -1750,9 +1750,9 @@ pub(crate) fn render_impl_summary( write!(w, "<h3 class=\"code-header in-band\">"); if let Some(use_absolute) = use_absolute { - write!(w, "{}", i.inner_impl().print(use_absolute, cx)); + write!(w, "{}", inner_impl.print(use_absolute, cx)); if show_def_docs { - for it in &i.inner_impl().items { + for it in &inner_impl.items { if let clean::AssocTypeItem(ref tydef, ref _bounds) = *it.kind { w.write_str("<span class=\"where fmt-newline\"> "); assoc_type( @@ -1770,11 +1770,11 @@ pub(crate) fn render_impl_summary( } } } else { - write!(w, "{}", i.inner_impl().print(false, cx)); + write!(w, "{}", inner_impl.print(false, cx)); } write!(w, "</h3>"); - let is_trait = i.inner_impl().trait_.is_some(); + let is_trait = inner_impl.trait_.is_some(); if is_trait { if let Some(portability) = portability(&i.impl_item, Some(parent)) { write!(w, "<span class=\"item-info\">{}</span>", portability); |
