Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rustdoc: migrate item_struct to an Askama template #111430

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

rustdoc: migrate item_struct to an Askama template #111430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eb2b7dc
Use `display_fn` for `render_attributes_in_code`
nicklimmm May 8, 2023
8a81e1c
Use template struct for item_struct
nicklimmm May 10, 2023
4833758
Expand `render_fields()`
nicklimmm May 12, 2023
ca02fde
Expand `render_field()`
nicklimmm May 12, 2023
6319202
Use functions instead of wrapping methods
nicklimmm May 24, 2023
6a892f8
Convert `should_render_fields` into a field
nicklimmm May 24, 2023
0fb10ab
Fix borrowing errors
nicklimmm May 24, 2023
97aca51
Expand `render_field_in_span` in template
nicklimmm May 24, 2023
1270d00
Use `ItemTemplate` trait
nicklimmm May 29, 2023
39c9c50
Use `item_template` macro
nicklimmm Jun 12, 2023
d4d9618
Combine `write!()` calls and convert to `write_str()`
nicklimmm Jun 14, 2023
faacad5
Remove extra `{`
nicklimmm Jun 14, 2023
5e3980b
Move item template structs outside of function
nicklimmm Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/librustdoc/html/render/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ fn assoc_method(
write!(w, "{}", render_attributes_in_pre(meth, indent_str, cx));
(4, indent_str, Ending::NoNewline)
} else {
render_attributes_in_code(w, meth, cx);
write!(w, "{}", render_attributes_in_code(meth, tcx));
(0, "", Ending::Newline)
};
w.reserve(header_len + "<a href=\"\" class=\"fn\">{".len() + "</a>".len());
Expand Down Expand Up @@ -1075,10 +1075,16 @@ fn render_attributes_in_pre<'a, 'tcx: 'a>(

// When an attribute is rendered inside a <code> tag, it is formatted using
// a div to produce a newline after it.
fn render_attributes_in_code(w: &mut impl fmt::Write, it: &clean::Item, cx: &Context<'_>) {
for attr in it.attributes(cx.tcx(), cx.cache(), false) {
write!(w, "<div class=\"code-attribute\">{attr}</div>").unwrap();
}
fn render_attributes_in_code<'a, 'tcx>(
it: &'a clean::Item,
tcx: TyCtxt<'tcx>,
) -> impl fmt::Display + Captures<'a> + Captures<'tcx> {
display_fn(move |f| {
for a in it.attributes(tcx, false) {
write!(f, "<div class=\"code-attribute\">{}</div>", a)?;
}
Ok(())
})
}

#[derive(Copy, Clone)]
Expand Down
Loading
Loading