Auto merge of #359 - vvilhonen:vvilhonen/expose-htmlserializer-for-customizing-output, r=jdm

bors-servo · web-flow · commit 2edfe085f594 · 2019-01-23T11:27:21.000-05:00
Expose HtmlSerializer for customizing output

This allows 3rd party crates to customize the output without duplicating all the serialization logic. I'm using it myself to pretty print transformed html, where I don't care that the added whitespace changes the meaning of the document.
diff --git a/html5ever/src/serialize/mod.rs b/html5ever/src/serialize/mod.rs
@@ -55,8 +55,8 @@ struct ElemInfo {
     processed_first_child: bool,
 }
 
-struct HtmlSerializer<Wr: Write> {
-    writer: Wr,
+pub struct HtmlSerializer<Wr: Write> {
+    pub writer: Wr,
     opts: SerializeOpts,
     stack: Vec<ElemInfo>,
 }
@@ -74,7 +74,7 @@ fn tagname(name: &QualName) -> LocalName {
 }
 
 impl<Wr: Write> HtmlSerializer<Wr> {
-    fn new(writer: Wr, opts: SerializeOpts) -> Self {
+    pub fn new(writer: Wr, opts: SerializeOpts) -> Self {
         let html_name = match opts.traversal_scope {
             TraversalScope::IncludeNode | TraversalScope::ChildrenOnly(None) => None,
             TraversalScope::ChildrenOnly(Some(ref n)) => Some(tagname(n)),

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ struct ElemInfo {`
`55`	`55`	`processed_first_child: bool,`
`56`	`56`	`}`
`57`	`57`
`58`		`-struct HtmlSerializer<Wr: Write> {`
`59`		`- writer: Wr,`
	`58`	`+pub struct HtmlSerializer<Wr: Write> {`
	`59`	`+ pub writer: Wr,`
`60`	`60`	`opts: SerializeOpts,`
`61`	`61`	`stack: Vec<ElemInfo>,`
`62`	`62`	`}`
`@@ -74,7 +74,7 @@ fn tagname(name: &QualName) -> LocalName {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`impl<Wr: Write> HtmlSerializer<Wr> {`
`77`		`- fn new(writer: Wr, opts: SerializeOpts) -> Self {`
	`77`	`+ pub fn new(writer: Wr, opts: SerializeOpts) -> Self {`
`78`	`78`	`let html_name = match opts.traversal_scope {`
`79`	`79`	`TraversalScope::IncludeNode \| TraversalScope::ChildrenOnly(None) => None,`
`80`	`80`	`TraversalScope::ChildrenOnly(Some(ref n)) => Some(tagname(n)),`