From 134eae9383f84caf21bb5d958d6afa6cd478fb2b Mon Sep 17 00:00:00 2001 From: Yotam Ofek Date: Thu, 6 Feb 2025 20:18:47 +0000 Subject: [PATCH] =?UTF-8?q?librustdoc:=20remove=20unused=20`for=5Fhtml`=20?= =?UTF-8?q?field=20from=20`Buffer`=20=F0=9F=A6=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/librustdoc/html/format.rs | 13 ++----------- src/librustdoc/html/layout.rs | 4 ++-- src/librustdoc/html/render/context.rs | 4 ++-- src/librustdoc/html/render/mod.rs | 16 ++++++++-------- src/librustdoc/html/render/print_item.rs | 4 ++-- src/librustdoc/html/render/write_shared.rs | 2 +- 6 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index b6a73602a322f..a5e34237e0c47 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -62,9 +62,8 @@ impl Print for &'_ str { } } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] pub(crate) struct Buffer { - for_html: bool, buffer: String, } @@ -86,16 +85,8 @@ impl core::fmt::Write for Buffer { } impl Buffer { - pub(crate) fn empty_from(v: &Buffer) -> Buffer { - Buffer { for_html: v.for_html, buffer: String::new() } - } - - pub(crate) fn html() -> Buffer { - Buffer { for_html: true, buffer: String::new() } - } - pub(crate) fn new() -> Buffer { - Buffer { for_html: false, buffer: String::new() } + Self::default() } pub(crate) fn is_empty(&self) -> bool { diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index d957cf1b569e3..032d2d562420b 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -98,8 +98,8 @@ pub(crate) fn render( let mut themes: Vec = style_files.iter().map(|s| s.basename().unwrap()).collect(); themes.sort(); - let content = Buffer::html().to_display(t); // Note: This must happen before making the sidebar. - let sidebar = Buffer::html().to_display(sidebar); + let content = Buffer::new().to_display(t); // Note: This must happen before making the sidebar. + let sidebar = Buffer::new().to_display(sidebar); PageLayout { static_root_path, page, diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs index 1cefdf96bbcd2..12e4edc61fdf5 100644 --- a/src/librustdoc/html/render/context.rs +++ b/src/librustdoc/html/render/context.rs @@ -235,7 +235,7 @@ impl<'tcx> Context<'tcx> { }; if !render_redirect_pages { - let mut page_buffer = Buffer::html(); + let mut page_buffer = Buffer::new(); print_item(self, it, &mut page_buffer); let page = layout::Page { css_class: tyname_s, @@ -627,7 +627,7 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> { rust_logo: has_doc_flag(self.tcx(), LOCAL_CRATE.as_def_id(), sym::rust_logo), }; let all = shared.all.replace(AllTypes::new()); - let mut sidebar = Buffer::html(); + let mut sidebar = Buffer::new(); // all.html is not customizable, so a blank id map is fine let blocks = sidebar_module_like(all.item_sections(), &mut IdMap::new(), ModuleLike::Crate); diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index f7dcb87e4f3d0..4f8ede6d294b9 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -1222,7 +1222,7 @@ pub(crate) fn render_all_impls( synthetic: &[&Impl], blanket_impl: &[&Impl], ) { - let mut impls = Buffer::html(); + let mut impls = Buffer::new(); render_impls(cx, &mut impls, concrete, containing_item, true); let impls = impls.into_inner(); if !impls.is_empty() { @@ -1277,7 +1277,7 @@ fn render_assoc_items_inner( let (non_trait, traits): (Vec<_>, _) = v.iter().partition(|i| i.inner_impl().trait_.is_none()); if !non_trait.is_empty() { let mut close_tags = >::with_capacity(1); - let mut tmp_buf = Buffer::html(); + let mut tmp_buf = Buffer::new(); let (render_mode, id, class_html) = match what { AssocItemRender::All => { write_impl_section_heading(&mut tmp_buf, "Implementations", "implementations"); @@ -1305,7 +1305,7 @@ fn render_assoc_items_inner( (RenderMode::ForDeref { mut_: deref_mut_ }, derived_id, r#" class="impl-items""#) } }; - let mut impls_buf = Buffer::html(); + let mut impls_buf = Buffer::new(); for i in &non_trait { render_impl( &mut impls_buf, @@ -1485,7 +1485,7 @@ pub(crate) fn notable_traits_button(ty: &clean::Type, cx: &Context<'_>) -> Optio } fn notable_traits_decl(ty: &clean::Type, cx: &Context<'_>) -> (String, String) { - let mut out = Buffer::html(); + let mut out = Buffer::new(); let did = ty.def_id(cx.cache()).expect("notable_traits_button already checked this"); @@ -1622,8 +1622,8 @@ fn render_impl( let in_trait_class = if trait_.is_some() { " trait-impl" } else { "" }; - let mut doc_buffer = Buffer::empty_from(boring); - let mut info_buffer = Buffer::empty_from(boring); + let mut doc_buffer = Buffer::new(); + let mut info_buffer = Buffer::new(); let mut short_documented = true; if render_method_item { @@ -1819,8 +1819,8 @@ fn render_impl( } } - let mut impl_items = Buffer::empty_from(w); - let mut default_impl_items = Buffer::empty_from(w); + let mut impl_items = Buffer::new(); + let mut default_impl_items = Buffer::new(); let impl_ = i.inner_impl(); // Impl items are grouped by kinds: diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs index 4f51b7a010833..db7369d455d89 100644 --- a/src/librustdoc/html/render/print_item.rs +++ b/src/librustdoc/html/render/print_item.rs @@ -787,7 +787,7 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra let item_type = m.type_(); let id = cx.derive_id(format!("{item_type}.{name}")); - let mut content = Buffer::empty_from(w); + let mut content = Buffer::new(); write!(content, "{}", document_full(m, cx, HeadingOffset::H5)); let toggled = !content.is_empty(); @@ -2152,7 +2152,7 @@ fn render_union<'a, 'cx: 'a>( let where_displayed = g .map(|g| { - let mut buf = Buffer::html(); + let mut buf = Buffer::new(); write!(buf, "{}", g.print(cx)); let where_displayed = print_where_clause_and_check(&mut buf, g, cx); write!(f, "{buf}", buf = buf.into_inner()).unwrap(); diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs index 57d07c05c1189..3fb8945271f6d 100644 --- a/src/librustdoc/html/render/write_shared.rs +++ b/src/librustdoc/html/render/write_shared.rs @@ -622,7 +622,7 @@ impl TypeAliasPart { // to make that functionality work here, it needs to be called with // each type alias, and if it gives a different result, split the impl for &(type_alias_fqp, type_alias_item) in type_aliases { - let mut buf = Buffer::html(); + let mut buf = Buffer::new(); cx.id_map.borrow_mut().clear(); cx.deref_id_map.borrow_mut().clear(); let target_did = impl_