Move module listing open tag into render_attributes_in_code_with_options

Author: chojs23

src/librustdoc/html/render/mod.rs

@@ -2913,8 +2913,7 @@ fn render_attributes_in_code(
     prefix: &str,
     cx: &Context<'_>,
 ) -> fmt::Result {
-    let _ = render_attributes_in_code_with_options(w, item, prefix, cx, true, None)?;
-    Ok(())
+    render_attributes_in_code_with_options(w, item, prefix, cx, true, "")
 }
 
 pub(super) fn render_attributes_in_code_with_options(
@@ -2923,20 +2922,11 @@ pub(super) fn render_attributes_in_code_with_options(
     prefix: &str,
     cx: &Context<'_>,
     render_doc_hidden: bool,
-    open_tag: Option<&str>,
-) -> Result<bool, fmt::Error> {
-    let mut wrote_any = false;
-    let open_tag = open_tag.unwrap_or("");
-    let mut render_attr = |attr: &str| -> fmt::Result {
-        if !wrote_any {
-            w.write_str(open_tag)?;
-            wrote_any = true;
-        }
-        render_code_attribute(prefix, attr, w)
-    };
-
+    open_tag: &str,
+) -> fmt::Result {
+    w.write_str(open_tag)?;
     if render_doc_hidden && item.is_doc_hidden() {
-        render_attr("#[doc(hidden)]")?;
+        render_code_attribute(prefix, "#[doc(hidden)]", w)?;
     }
     for attr in &item.attrs.other_attrs {
         let hir::Attribute::Parsed(kind) = attr else { continue };
@@ -2951,15 +2941,15 @@ pub(super) fn render_attributes_in_code_with_options(
             AttributeKind::NonExhaustive(..) => Cow::Borrowed("#[non_exhaustive]"),
             _ => continue,
         };
-        render_attr(attr.as_ref())?;
+        render_code_attribute(prefix, attr.as_ref(), w)?;
     }
 
     if let Some(def_id) = item.def_id()
         && let Some(repr) = repr_attribute(cx.tcx(), cx.cache(), def_id)
     {
-        render_attr(&repr)?;
+        render_code_attribute(prefix, &repr, w)?;
     }
-    Ok(wrote_any)
+    Ok(())
 }
 
 fn render_repr_attribute_in_code(

src/librustdoc/html/render/print_item.rs

@@ -359,17 +359,14 @@ fn item_module(cx: &Context<'_>, item: &clean::Item, items: &[clean::Item]) -> i
 
                         let visibility_and_hidden = visibility_and_hidden(myitem);
                         // Module listings use the hidden marker, so skip doc(hidden) here.
-                        let wrote_attrs = super::render_attributes_in_code_with_options(
+                        super::render_attributes_in_code_with_options(
                             w,
                             myitem,
                             "",
                             cx,
                             false,
-                            Some("<dt><code>"),
+                            "<dt><code>",
                         )?;
-                        if !wrote_attrs {
-                            w.write_str("<dt><code>")?;
-                        }
                         match *src {
                             Some(src) => {
                                 write!(