Expand render_field()

Author: nicklimmm

src/librustdoc/html/render/print_item.rs

@@ -1651,7 +1651,7 @@ fn item_struct(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean
             document_non_exhaustive(self.it)
         }
 
-        fn render_field<'b>(
+        fn render_field_in_span<'b>(
             &'b self,
             index: &'b usize,
             field: &'b clean::Item,
@@ -1662,16 +1662,24 @@ fn item_struct(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean
                 let field_name =
                     field.name.map_or_else(|| index.to_string(), |sym| sym.as_str().to_string());
                 let id = cx.derive_id(format!("{}.{}", ItemType::StructField, field_name));
+                let ty = ty.print(*cx);
                 write!(
                     f,
                     "<span id=\"{id}\" class=\"{item_type} small-section-header\">\
                         <a href=\"#{id}\" class=\"anchor field\">§</a>\
                         <code>{field_name}: {ty}</code>\
                     </span>",
-                    ty = ty.print(*cx),
                     item_type = ItemType::StructField,
-                )?;
+                )
+            })
+        }
 
+        fn document_field<'b>(
+            &'b self,
+            field: &'b clean::Item,
+        ) -> impl fmt::Display + Captures<'a> + 'b + Captures<'cx> {
+            display_fn(move |f| {
+                let mut cx = self.cx.borrow_mut();
                 let v = document(*cx, field, Some(self.it), HeadingOffset::H3);
                 write!(f, "{v}")
             })

src/librustdoc/html/templates/item_struct.html

@@ -15,7 +15,8 @@ <h2 id="fields" class="fields small-section header">
     </h2>
     {{ self.document_non_exhaustive() | safe }}
     {% for (index, (field, ty)) in self.fields().enumerate() %}
-        {{ self.render_field(index, field, ty) | safe }}
+        {{ self.render_field_in_span(index, field, ty) | safe }}
+        {{ self.document_field(field) | safe }}
     {% endfor %}
 {% endif %}
 {{ self.render_assoc_items() | safe }}