diff options
author | Pyfisch <pyfisch@gmail.com> | 2018-11-06 13:01:35 +0100 |
---|---|---|
committer | Pyfisch <pyfisch@gmail.com> | 2018-11-06 22:30:31 +0100 |
commit | cb07debcb6f3d3561177ce536c320986720791b7 (patch) | |
tree | ccac4d5a48b3112230f3fc2e873753dd7263e9fb /components/script/dom/servoparser | |
parent | bf47f90da667e95eaffc8fee36ca8a88e72e276c (diff) | |
download | servo-cb07debcb6f3d3561177ce536c320986720791b7.tar.gz servo-cb07debcb6f3d3561177ce536c320986720791b7.zip |
Format remaining files
Diffstat (limited to 'components/script/dom/servoparser')
-rw-r--r-- | components/script/dom/servoparser/async_html.rs | 12 | ||||
-rw-r--r-- | components/script/dom/servoparser/html.rs | 3 | ||||
-rw-r--r-- | components/script/dom/servoparser/mod.rs | 26 |
3 files changed, 25 insertions, 16 deletions
diff --git a/components/script/dom/servoparser/async_html.rs b/components/script/dom/servoparser/async_html.rs index 86e1b77675b..8b1c00aeb02 100644 --- a/components/script/dom/servoparser/async_html.rs +++ b/components/script/dom/servoparser/async_html.rs @@ -257,7 +257,8 @@ impl Tokenizer { to_tokenizer_sender, html_tokenizer_receiver, ); - }).expect("HTML Parser thread spawning failed"); + }) + .expect("HTML Parser thread spawning failed"); tokenizer } @@ -273,7 +274,8 @@ impl Tokenizer { self.html_tokenizer_sender .send(ToHtmlTokenizerMsg::Feed { input: send_tendrils, - }).unwrap(); + }) + .unwrap(); loop { match self @@ -715,7 +717,8 @@ impl TreeSink for Sink { .map(|attr| Attribute { name: attr.name, value: String::from(attr.value), - }).collect(); + }) + .collect(); self.send_op(ParseOperation::CreateElement { node: node.id, @@ -835,7 +838,8 @@ impl TreeSink for Sink { .map(|attr| Attribute { name: attr.name, value: String::from(attr.value), - }).collect(); + }) + .collect(); self.send_op(ParseOperation::AddAttrsIfMissing { target: target.id, attrs, diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs index 1ec6b1feca7..cbdf74789a8 100644 --- a/components/script/dom/servoparser/html.rs +++ b/components/script/dom/servoparser/html.rs @@ -127,7 +127,8 @@ fn start_element<S: Serializer>(node: &Element, serializer: &mut S) -> io::Resul let qname = QualName::new(None, attr.namespace().clone(), attr.local_name().clone()); let value = attr.value().clone(); (qname, value) - }).collect::<Vec<_>>(); + }) + .collect::<Vec<_>>(); let attr_refs = attrs.iter().map(|&(ref qname, ref value)| { let ar: AttrRef = (&qname, &**value); ar diff --git a/components/script/dom/servoparser/mod.rs b/components/script/dom/servoparser/mod.rs index 8ce775f6fa8..10326a4eb82 100644 --- a/components/script/dom/servoparser/mod.rs +++ b/components/script/dom/servoparser/mod.rs @@ -722,8 +722,9 @@ impl FetchResponseListener for ParserContext { let doc_body = DomRoot::upcast::<Node>(doc.GetBody().unwrap()); let img = HTMLImageElement::new(local_name!("img"), None, doc); img.SetSrc(DOMString::from(self.url.to_string())); - doc_body.AppendChild(&DomRoot::upcast::<Node>(img)).expect("Appending failed"); - + doc_body + .AppendChild(&DomRoot::upcast::<Node>(img)) + .expect("Appending failed"); }, Some(ref mime) if mime.type_() == mime::TEXT && mime.subtype() == mime::PLAIN => { // https://html.spec.whatwg.org/multipage/#read-text @@ -750,17 +751,20 @@ impl FetchResponseListener for ParserContext { } }, // Handle text/xml, application/xml - Some(ref mime) if (mime.type_() == mime::TEXT && mime.subtype() == mime::XML) || - (mime.type_() == mime::APPLICATION && mime.subtype() == mime::XML) => {}, - Some(ref mime) if mime.type_() == mime::APPLICATION && - mime.subtype().as_str() == "xhtml" && - mime.suffix() == Some(mime::XML) - => {}, // Handle xhtml (application/xhtml+xml) + Some(ref mime) + if (mime.type_() == mime::TEXT && mime.subtype() == mime::XML) || + (mime.type_() == mime::APPLICATION && mime.subtype() == mime::XML) => {}, + Some(ref mime) + if mime.type_() == mime::APPLICATION && + mime.subtype().as_str() == "xhtml" && + mime.suffix() == Some(mime::XML) => {}, // Handle xhtml (application/xhtml+xml) Some(ref mime) => { // Show warning page for unknown mime types. - let page = format!("<html><body><p>Unknown content type ({}/{}).</p></body></html>", - mime.type_().as_str(), - mime.subtype().as_str()); + let page = format!( + "<html><body><p>Unknown content type ({}/{}).</p></body></html>", + mime.type_().as_str(), + mime.subtype().as_str() + ); self.is_synthesized_document = true; parser.push_string_input_chunk(page); parser.parse_sync(); |