Use functions instead of wrapping methods

Author: nicklimmm

src/librustdoc/html/render/print_item.rs

@@ -1820,15 +1820,6 @@ fn item_struct(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean
     }
 
     impl<'a, 'cx: 'a> ItemStruct<'a, 'cx> {
-        fn render_attributes_in_code<'b>(
-            &'b self,
-        ) -> impl fmt::Display + Captures<'a> + 'b + Captures<'cx> {
-            display_fn(move |f| {
-                let tcx = self.cx.borrow().tcx();
-                write!(f, "{}", render_attributes_in_code(self.it, tcx))
-            })
-        }
-
         fn render_struct<'b>(&'b self) -> impl fmt::Display + Captures<'a> + 'b + Captures<'cx> {
             display_fn(move |f| {
                 let cx = self.cx.borrow();
@@ -1865,14 +1856,6 @@ fn item_struct(w: &mut Buffer, cx: &mut Context<'_>, it: &clean::Item, s: &clean
                 && self.fields().peekable().peek().is_some()
         }
 
-        fn document_non_exhaustive_header(&self) -> &str {
-            document_non_exhaustive_header(self.it)
-        }
-
-        fn document_non_exhaustive(&self) -> impl fmt::Display + 'a {
-            document_non_exhaustive(self.it)
-        }
-
         fn render_field_in_span<'b>(
             &'b self,
             index: &'b usize,

src/librustdoc/html/templates/item_struct.html

@@ -1,5 +1,5 @@
 <pre class="rust item-decl"><code>
-    {{ self.render_attributes_in_code() | safe }}
+    {{ self::render_attributes_in_code(self.it, self.cx.borrow().tcx()) | safe }}
     {{ self.render_struct() | safe }}
 </code></pre>
 {{ self.document() | safe }}
@@ -10,10 +10,10 @@ <h2 id="fields" class="fields small-section header">
         {% else %}
             Tuple Fields
         {% endif %}
-        {{ self.document_non_exhaustive_header() | safe }}
+        {{ self::document_non_exhaustive_header(self.it) | safe }}
         <a href="#fields" class="anchor">§</a>
     </h2>
-    {{ self.document_non_exhaustive() | safe }}
+    {{ self::document_non_exhaustive(self.it) | safe }}
     {% for (index, (field, ty)) in self.fields().enumerate() %}
         {{ self.render_field_in_span(index, field, ty) | safe }}
         {{ self.document_field(field) | safe }}