Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Delete Sidebar struct in favor of FnOnce impl
  • Loading branch information
Mark-Simulacrum committed Sep 7, 2019
1 parent f4a15ae commit eefaee1
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/librustdoc/html/render.rs
Expand Up @@ -387,8 +387,6 @@ struct Item<'a> {
item: &'a clean::Item,
}

struct Sidebar<'a> { cx: &'a Context, item: &'a clean::Item, }

/// Struct representing one entry in the JS search index. These are all emitted
/// by hand to a large JS file at the end of cache-creation.
#[derive(Debug)]
Expand Down Expand Up @@ -1994,7 +1992,7 @@ impl Context {

if !self.render_redirect_pages {
layout::render(&self.shared.layout, &page,
Sidebar{ cx: self, item: it },
|buf: &mut _| print_sidebar(self, it, buf),
&Item{ cx: self, item: it },
&self.shared.themes)
} else {
Expand Down Expand Up @@ -4266,10 +4264,7 @@ fn item_foreign_type(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item)
render_assoc_items(w, cx, it, it.def_id, AssocItemRender::All)
}

impl Print for Sidebar<'_> {
fn print(self, buffer: &mut Buffer) {
let cx = self.cx;
let it = self.item;
fn print_sidebar(cx: &Context, it: &clean::Item, buffer: &mut Buffer) {
let parentlen = cx.current.len() - if it.is_mod() {1} else {0};

if it.is_struct() || it.is_trait() || it.is_primitive() || it.is_union()
Expand Down Expand Up @@ -4360,7 +4355,6 @@ impl Print for Sidebar<'_> {
// Closes sidebar-elems div.
write!(buffer, "</div>");
}
}

fn get_next_url(used_links: &mut FxHashSet<String>, url: String) -> String {
if used_links.insert(url.clone()) {
Expand Down

0 comments on commit eefaee1

Please sign in to comment.