From eebd0265c328b80d67f89df04879ef64bd229a5f Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Fri, 30 Aug 2019 10:24:42 -0400 Subject: [PATCH] Migrate top-level rendering to Buffer --- src/librustdoc/html/layout.rs | 8 ++-- src/librustdoc/html/render.rs | 83 +++++++++++++++++----------------- src/librustdoc/html/sources.rs | 10 ++-- 3 files changed, 49 insertions(+), 52 deletions(-) diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index ae0bd1aafa8..2856db7ef98 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -1,9 +1,9 @@ use std::fmt; -use std::io; use std::path::PathBuf; use crate::externalfiles::ExternalHtml; use crate::html::render::SlashChecker; +use crate::html::format::Buffer; #[derive(Clone)] pub struct Layout { @@ -26,7 +26,7 @@ pub struct Page<'a> { } pub fn render( - dst: &mut dyn io::Write, + dst: &mut Buffer, layout: &Layout, page: &Page<'_>, sidebar: &S, @@ -34,7 +34,7 @@ pub fn render( css_file_extension: bool, themes: &[PathBuf], generate_search_filter: bool, -) -> io::Result<()> { +) { let static_root_path = page.static_root_path.unwrap_or(page.root_path); write!(dst, "\ @@ -238,7 +238,7 @@ pub fn render( ) } -pub fn redirect(dst: &mut dyn io::Write, url: &str) -> io::Result<()> { +pub fn redirect(dst: &mut Buffer, url: &str) { //