From f8b5b8a0329c146a4104785f7765bee2e3910c0d Mon Sep 17 00:00:00 2001 From: David Wendt Date: Sun, 5 Jan 2020 00:22:36 -0500 Subject: [PATCH] Use `unwrap_or_default` where available --- core/src/avm1/globals/xml.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/core/src/avm1/globals/xml.rs b/core/src/avm1/globals/xml.rs index 1ef888ef6..8658a0540 100644 --- a/core/src/avm1/globals/xml.rs +++ b/core/src/avm1/globals/xml.rs @@ -714,12 +714,8 @@ pub fn xml_create_element<'gc>( let nodename = args .get(0) - .map(|v| { - v.clone() - .coerce_to_string(avm, ac) - .unwrap_or_else(|_| "".to_string()) - }) - .unwrap_or_else(|| "".to_string()); + .map(|v| v.clone().coerce_to_string(avm, ac).unwrap_or_default()) + .unwrap_or_default(); 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)); @@ -742,12 +738,8 @@ pub fn xml_create_text_node<'gc>( let text_node = args .get(0) - .map(|v| { - v.clone() - .coerce_to_string(avm, ac) - .unwrap_or_else(|_| "".to_string()) - }) - .unwrap_or_else(|| "".to_string()); + .map(|v| v.clone().coerce_to_string(avm, ac).unwrap_or_default()) + .unwrap_or_default(); 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));