Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary deref()s (fixes #3586)

Browse source
This commit is contained in:
Tim Taubert 2014-10-09 13:12:02 +02:00
parent 15b508ac10
commit 35f8270c64
30 changed files with 147 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

40
components/script/dom/htmlserializer.rs
View file

@ -69,7 +69,7 @@ pub fn serialize(iterator: &mut NodeIterator) -> String {
fn serialize_comment(comment: JSRef<Comment>, html: &mut String) {
html.push_str("<!--");
html.push_str(comment.deref().characterdata.data.borrow().as_slice());
html.push_str(comment.characterdata.data.borrow().as_slice());
html.push_str("-->");
}
@ -78,49 +78,49 @@ fn serialize_text(text: JSRef<Text>, html: &mut String) {
match text_node.parent_node().map(|node| node.root()) {
Some(ref parent) if parent.is_element() => {
let elem: JSRef<Element> = ElementCast::to_ref(**parent).unwrap();
match elem.deref().local_name.as_slice() {
match elem.local_name.as_slice() {
"style" | "script" | "xmp" | "iframe" |
"noembed" | "noframes" | "plaintext" |
"noscript" if elem.deref().namespace == ns!(HTML)
=> html.push_str(text.deref().characterdata.data.borrow().as_slice()),
_ => escape(text.deref().characterdata.data.borrow().as_slice(), false, html)
"noscript" if elem.namespace == ns!(HTML)
=> html.push_str(text.characterdata.data.borrow().as_slice()),
_ => escape(text.characterdata.data.borrow().as_slice(), false, html)
}
}
_ => escape(text.deref().characterdata.data.borrow().as_slice(), false, html)
_ => escape(text.characterdata.data.borrow().as_slice(), false, html)
}
}
fn serialize_processing_instruction(processing_instruction: JSRef<ProcessingInstruction>,
html: &mut String) {
html.push_str("<?");
html.push_str(processing_instruction.deref().target.as_slice());
html.push_str(processing_instruction.target.as_slice());
html.push_char(' ');
html.push_str(processing_instruction.deref().characterdata.data.borrow().as_slice());
html.push_str(processing_instruction.characterdata.data.borrow().as_slice());
html.push_str("?>");
}
fn serialize_doctype(doctype: JSRef<DocumentType>, html: &mut String) {
html.push_str("<!DOCTYPE");
html.push_str(doctype.deref().name.as_slice());
html.push_str(doctype.name.as_slice());
html.push_char('>');
}
fn serialize_elem(elem: JSRef<Element>, open_elements: &mut Vec<String>, html: &mut String) {
html.push_char('<');
html.push_str(elem.deref().local_name.as_slice());
for attr in elem.deref().attrs.borrow().iter() {
html.push_str(elem.local_name.as_slice());
for attr in elem.attrs.borrow().iter() {
let attr = attr.root();
serialize_attr(*attr, html);
};
html.push_char('>');
match elem.deref().local_name.as_slice() {
"pre" | "listing" | "textarea" if elem.deref().namespace == ns!(HTML) => {
match elem.local_name.as_slice() {
"pre" | "listing" | "textarea" if elem.namespace == ns!(HTML) => {
let node: JSRef<Node> = NodeCast::from_ref(elem);
match node.first_child().map(|child| child.root()) {
Some(ref child) if child.is_text() => {
let text: JSRef<CharacterData> = CharacterDataCast::to_ref(**child).unwrap();
if text.deref().data.borrow().len() > 0 && text.deref().data.borrow().as_slice().char_at(0) == '\n' {
if text.data.borrow().len() > 0 && text.data.borrow().as_slice().char_at(0) == '\n' {
html.push_char('\x0A');
}
},
@ -131,26 +131,26 @@ fn serialize_elem(elem: JSRef<Element>, open_elements: &mut Vec<String>, html: &
}
if !(elem.is_void()) {
open_elements.push(elem.deref().local_name.as_slice().to_string());
open_elements.push(elem.local_name.as_slice().to_string());
}
}
fn serialize_attr(attr: JSRef<Attr>, html: &mut String) {
html.push_char(' ');
if attr.deref().namespace == ns!(XML) {
if attr.namespace == ns!(XML) {
html.push_str("xml:");
html.push_str(attr.local_name().as_slice());
} else if attr.deref().namespace == ns!(XMLNS) &&
} else if attr.namespace == ns!(XMLNS) &&
*attr.local_name() == Atom::from_slice("xmlns") {
html.push_str("xmlns");
} else if attr.deref().namespace == ns!(XMLNS) {
} else if attr.namespace == ns!(XMLNS) {
html.push_str("xmlns:");
html.push_str(attr.local_name().as_slice());
} else if attr.deref().namespace == ns!(XLink) {
} else if attr.namespace == ns!(XLink) {
html.push_str("xlink:");
html.push_str(attr.local_name().as_slice());
} else {
html.push_str(attr.deref().name.as_slice());
html.push_str(attr.name.as_slice());
};
html.push_str("=\"");
escape(attr.value().as_slice(), true, html);