aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/devtools.rs
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2015-11-11 16:26:53 -0600
committerAlan Jeffrey <ajeffrey@mozilla.com>2015-11-12 17:52:59 -0600
commit84bde75b420e7035cee891781a3805d5c8c4cdeb (patch)
tree061040f39149d530b059a998be832c7f9b0a8134 /components/script/devtools.rs
parent736323a7796594a5b966ab6ae690e5cc51225a14 (diff)
downloadservo-84bde75b420e7035cee891781a3805d5c8c4cdeb.tar.gz
servo-84bde75b420e7035cee891781a3805d5c8c4cdeb.zip
Replaced DOMString constructor by conversion functions.
Replaced DOMString(...) by DOMString::from(...). Replaced ....0 by String::from(...). Removed any uses of .to_owner() in DOMString::from("...").
Diffstat (limited to 'components/script/devtools.rs')
-rw-r--r--components/script/devtools.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index 3d1bc95c2de..94a84011caf 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -42,7 +42,7 @@ pub fn handle_evaluate_js(global: &GlobalRef, eval: String, reply: IpcSender<Eva
EvaluateJSReply::NumberValue(
FromJSValConvertible::from_jsval(cx, rval.handle(), ()).unwrap())
} else if rval.ptr.is_string() {
- EvaluateJSReply::StringValue(jsstring_to_str(cx, rval.ptr.to_string()).0)
+ EvaluateJSReply::StringValue(String::from(jsstring_to_str(cx, rval.ptr.to_string())))
} else if rval.ptr.is_null() {
EvaluateJSReply::NullValue
} else {
@@ -164,9 +164,9 @@ pub fn handle_modify_attribute(page: &Rc<Page>,
for modification in modifications {
match modification.newValue {
Some(string) => {
- let _ = elem.SetAttribute(DOMString(modification.attributeName), DOMString(string));
+ let _ = elem.SetAttribute(DOMString::from(modification.attributeName), DOMString::from(string));
},
- None => elem.RemoveAttribute(DOMString(modification.attributeName)),
+ None => elem.RemoveAttribute(DOMString::from(modification.attributeName)),
}
}
}