Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 23:28:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement Default trait for DOMString

Browse source
This commit is contained in:
Corey Farwell 2015-11-11 22:12:56 -05:00
parent 49d48a8680
commit 00fa3b2f85
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/documenttype.rs
View file

@ -31,8 +31,8 @@ impl DocumentType {
DocumentType { DocumentType {
node: Node::new_inherited(document), node: Node::new_inherited(document),
name: name, name: name,
public_id: public_id.unwrap_or(DOMString::new()), public_id: public_id.unwrap_or_default(),
system_id: system_id.unwrap_or(DOMString::new()) system_id: system_id.unwrap_or_default(),
} }
} }
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]

6
components/script/dom/node.rs
View file

@ -825,7 +825,7 @@ impl Node {
.map(|elem| elem.upcast::<Node>() == self) .map(|elem| elem.upcast::<Node>() == self)
.unwrap_or(false), .unwrap_or(false),
shortValue: self.GetNodeValue().unwrap_or(DOMString::new()), //FIXME: truncate shortValue: self.GetNodeValue().unwrap_or_default(), //FIXME: truncate
incompleteValue: false, //FIXME: reflect truncation incompleteValue: false, //FIXME: reflect truncation
} }
} }
@ -1893,7 +1893,7 @@ impl NodeMethods for Node {
// https://dom.spec.whatwg.org/#dom-node-nodevalue // https://dom.spec.whatwg.org/#dom-node-nodevalue
fn SetNodeValue(&self, val: Option<DOMString>) { fn SetNodeValue(&self, val: Option<DOMString>) {
if let Some(character_data) = self.downcast::<CharacterData>() { if let Some(character_data) = self.downcast::<CharacterData>() {
character_data.SetData(val.unwrap_or(DOMString::new())); character_data.SetData(val.unwrap_or_default());
} }
} }
@ -1918,7 +1918,7 @@ impl NodeMethods for Node {
// https://dom.spec.whatwg.org/#dom-node-textcontent // https://dom.spec.whatwg.org/#dom-node-textcontent
fn SetTextContent(&self, value: Option<DOMString>) { fn SetTextContent(&self, value: Option<DOMString>) {
let value = value.unwrap_or(DOMString::new()); let value = value.unwrap_or_default();
match self.type_id() { match self.type_id() {
NodeTypeId::DocumentFragment | NodeTypeId::DocumentFragment |
NodeTypeId::Element(..) => { NodeTypeId::Element(..) => {

6
components/util/str.rs
View file

@ -24,6 +24,12 @@ impl DOMString {
} }
} }
impl Default for DOMString {
fn default() -> Self {
DOMString(String::new())
}
}
impl Deref for DOMString { impl Deref for DOMString {
type Target = str; type Target = str;