Merge pull request #136 from SimonSapin/doctype-serialization

Ms2ger · Ms2ger · commit f026acf403e9 · 2015-05-24T10:57:02.000+02:00
Fix doctype serialization; r=Ms2ger
diff --git a/src/serialize/mod.rs b/src/serialize/mod.rs
@@ -223,7 +223,7 @@ impl<'wr, Wr: Write> Serializer<'wr, Wr> {
     pub fn write_doctype(&mut self, name: &str) -> io::Result<()> {
         try!(self.writer.write_all(b"<!DOCTYPE "));
         try!(self.writer.write_all(name.as_bytes()));
-        self.writer.write_all(b"\n")
+        self.writer.write_all(b">\n")
     }
 
     pub fn write_processing_instruction(&mut self, target: &str, data: &str) -> io::Result<()> {
diff --git a/tests/serializer.rs b/tests/serializer.rs
@@ -18,7 +18,7 @@ use std::default::Default;
 use std::borrow::ToOwned;
 
 use html5ever::driver::ParseOpts;
-use html5ever::{parse_fragment, one_input, serialize};
+use html5ever::{parse_fragment, parse, one_input, serialize};
 use html5ever_dom_sink::rcdom::RcDom;
 
 fn parse_and_serialize(input: String) -> String {
@@ -97,3 +97,12 @@ test!(attr_ns_1, r#"<svg xmlns="bleh"></svg>"#);
 test!(attr_ns_2, r#"<svg xmlns:foo="bleh"></svg>"#);
 test!(attr_ns_3, r#"<svg xmlns:xlink="bleh"></svg>"#);
 test!(attr_ns_4, r#"<svg xlink:href="bleh"></svg>"#);
+
+#[test]
+fn doctype() {
+    let dom: RcDom = parse(one_input("<!doctype html>".to_owned()), ParseOpts::default());
+    dom.document.borrow_mut().children.truncate(1);  // Remove <html>
+    let mut result = vec![];
+    serialize(&mut result, &dom.document, Default::default()).unwrap();
+    assert_eq!(String::from_utf8(result).unwrap(), "<!DOCTYPE html>\n");
+}

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ impl<'wr, Wr: Write> Serializer<'wr, Wr> {`
`223`	`223`	`pub fn write_doctype(&mut self, name: &str) -> io::Result<()> {`
`224`	`224`	`try!(self.writer.write_all(b"<!DOCTYPE "));`
`225`	`225`	`try!(self.writer.write_all(name.as_bytes()));`
`226`		`- self.writer.write_all(b"\n")`
	`226`	`+ self.writer.write_all(b">\n")`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`pub fn write_processing_instruction(&mut self, target: &str, data: &str) -> io::Result<()> {`