Use `unwrap_or_default` where available
This commit is contained in:
parent
ef7c5d7eb9
commit
f8b5b8a032
|
@ -714,12 +714,8 @@ pub fn xml_create_element<'gc>(
|
||||||
|
|
||||||
let nodename = args
|
let nodename = args
|
||||||
.get(0)
|
.get(0)
|
||||||
.map(|v| {
|
.map(|v| v.clone().coerce_to_string(avm, ac).unwrap_or_default())
|
||||||
v.clone()
|
.unwrap_or_default();
|
||||||
.coerce_to_string(avm, ac)
|
|
||||||
.unwrap_or_else(|_| "".to_string())
|
|
||||||
})
|
|
||||||
.unwrap_or_else(|| "".to_string());
|
|
||||||
let mut xml_node = XMLNode::new_element(ac.gc_context, &nodename, document)?;
|
let mut xml_node = XMLNode::new_element(ac.gc_context, &nodename, document)?;
|
||||||
let object = XMLObject::from_xml_node(ac.gc_context, xml_node, Some(avm.prototypes().xml_node));
|
let object = XMLObject::from_xml_node(ac.gc_context, xml_node, Some(avm.prototypes().xml_node));
|
||||||
|
|
||||||
|
@ -742,12 +738,8 @@ pub fn xml_create_text_node<'gc>(
|
||||||
|
|
||||||
let text_node = args
|
let text_node = args
|
||||||
.get(0)
|
.get(0)
|
||||||
.map(|v| {
|
.map(|v| v.clone().coerce_to_string(avm, ac).unwrap_or_default())
|
||||||
v.clone()
|
.unwrap_or_default();
|
||||||
.coerce_to_string(avm, ac)
|
|
||||||
.unwrap_or_else(|_| "".to_string())
|
|
||||||
})
|
|
||||||
.unwrap_or_else(|| "".to_string());
|
|
||||||
let mut xml_node = XMLNode::new_text(ac.gc_context, &text_node, document);
|
let mut xml_node = XMLNode::new_text(ac.gc_context, &text_node, document);
|
||||||
let object = XMLObject::from_xml_node(ac.gc_context, xml_node, Some(avm.prototypes().xml_node));
|
let object = XMLObject::from_xml_node(ac.gc_context, xml_node, Some(avm.prototypes().xml_node));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue