Simplify code and improve code comments

Author: GuillaumeGomez

src/librustdoc/clean/mod.rs

@@ -2777,10 +2777,10 @@ fn clean_maybe_renamed_item<'tcx>(
         // before.
         match item.kind {
             ItemKind::Impl(ref impl_) => {
-                // `renamed` is passed down to `clean_impl` because we use it as a marker to
-                // indicate that this is an inlined impl and that we should generate an impl
-                // placeholder and not a "real" impl item.
-                return clean_impl(impl_, item.owner_id.def_id, cx, renamed);
+                // If `renamed` is `Some()` for an `impl`, it means it's been inlined because we use
+                // it as a marker to indicate that this is an inlined impl and that we should
+                // generate an impl placeholder and not a "real" impl item.
+                return clean_impl(impl_, item.owner_id.def_id, cx, renamed.is_some());
             }
             ItemKind::Use(path, kind) => {
                 return clean_use_statement(
@@ -2914,16 +2914,16 @@ fn clean_impl<'tcx>(
     impl_: &hir::Impl<'tcx>,
     def_id: LocalDefId,
     cx: &mut DocContext<'tcx>,
-    // If `renamed` is some, then `impl_` is an inlined impl and it will be handled later on in the
-    // code. In here, we will generate a placeholder for it in order to be able to compute its
+    // If true, this is an inlined impl and it will be handled later on in the code.
+    // In here, we will generate a placeholder for it in order to be able to compute its
     // `doc_cfg` info.
-    renamed: Option<Symbol>,
+    is_inlined: bool,
 ) -> Vec<Item> {
     let tcx = cx.tcx;
     let mut ret = Vec::new();
     let trait_ = match impl_.of_trait {
         Some(t) => {
-            if renamed.is_some() {
+            if is_inlined {
                 return vec![Item::from_def_id_and_parts(
                     def_id.to_def_id(),
                     None,

src/librustdoc/passes/propagate_doc_cfg.rs

@@ -29,7 +29,7 @@ struct CfgPropagator<'a, 'tcx> {
     cx: &'a mut DocContext<'tcx>,
     cfg_info: CfgInfo,
 
-    /// To ensure the `doc_cfg` feature works with how `rustdoc` handles impl, we need to store
+    /// To ensure the `doc_cfg` feature works with how `rustdoc` handles impls, we need to store
     /// the `cfg` info of `impl`s placeholder to use them later on the "real" impl item.
     impl_cfg_info: FxHashMap<ItemId, CfgInfo>,
 }
@@ -85,7 +85,7 @@ impl DocFolder for CfgPropagator<'_, '_> {
         let old_cfg_info = self.cfg_info.clone();
 
         // If we have an impl, we check if it has an associated `cfg` "context", and if so we will
-        // use this context instead of the actual (wrong) one.
+        // use that context instead of the actual (wrong) one.
         if let ItemKind::ImplItem(_) = item.kind
             && let Some(cfg_info) = self.impl_cfg_info.remove(&item.item_id)
         {

src/librustdoc/visit_ast.rs

@@ -372,6 +372,19 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
             && !inherits_doc_hidden(tcx, item_def_id, None)
     }
 
+    #[inline]
+    fn add_impl_to_current_mod(&mut self, item: &'tcx hir::Item<'_>, impl_: hir::Impl<'_>) {
+        self.add_to_current_mod(
+            item,
+            // The symbol here is used as a "sentinel" value and has no meaning in
+            // itself. It just tells that this is an inlined impl and that it should not
+            // be cleaned as a normal `ImplItem` but instead as a `PlaceholderImplItem`.
+            // It's to ensure that `doc_cfg` inheritance works as expected.
+            if impl_.of_trait.is_none() { None } else { Some(rustc_span::symbol::kw::Impl) },
+            None,
+        );
+    }
+
     #[inline]
     fn add_to_current_mod(
         &mut self,
@@ -427,19 +440,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
             // Bar::bar();
             // ```
             if let hir::ItemKind::Impl(impl_) = item.kind {
-                self.add_to_current_mod(
-                    item,
-                    // The symbol here is used as a "sentinel" value and has no meaning in
-                    // itself. It just tells that this is an inlined impl and that it should not
-                    // be cleaned as a normal `ImplItem` but instead as a `PlaceholderImplItem`.
-                    // It's to ensure that `doc_cfg` inheritance works as expected.
-                    if impl_.of_trait.is_none() {
-                        None
-                    } else {
-                        Some(rustc_span::symbol::kw::Impl)
-                    },
-                    None,
-                );
+                self.add_impl_to_current_mod(item, impl_);
             }
             return;
         }
@@ -541,19 +542,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
                 // Don't duplicate impls when inlining, we'll pick
                 // them up regardless of where they're located.
                 if !self.inlining {
-                    self.add_to_current_mod(
-                        item,
-                        // The symbol here is used as a "sentinel" value and has no meaning in
-                        // itself. It just tells that this is an inlined impl and that it should not
-                        // be cleaned as a normal `ImplItem` but instead as a `PlaceholderImplItem`.
-                        // It's to ensure that `doc_cfg` inheritance works as expected.
-                        if impl_.of_trait.is_none() {
-                            None
-                        } else {
-                            Some(rustc_span::symbol::kw::Impl)
-                        },
-                        None,
-                    );
+                    self.add_impl_to_current_mod(item, impl_);
                 }
             }
         }