aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/devtools.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-08-24 06:19:37 -0500
committerGitHub <noreply@github.com>2016-08-24 06:19:37 -0500
commit3c4a08c016c0fd62496bcc7ffdbe850ce8813ccd (patch)
tree127e3af3997b9af0f9d8c6c9b707c03699d9ecf9 /components/script/devtools.rs
parent9d320881160f2d64d9e5b79e8c17336037dfbede (diff)
parent2f3f4a5bd6d60d2f25a3133b18c1baa9d979c654 (diff)
downloadservo-3c4a08c016c0fd62496bcc7ffdbe850ce8813ccd.tar.gz
servo-3c4a08c016c0fd62496bcc7ffdbe850ce8813ccd.zip
Auto merge of #12954 - GuillaumeGomez:dictionary_error, r=nox
Update rust-mozjs <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12954) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/devtools.rs')
-rw-r--r--components/script/devtools.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index 024307bc696..389d652fefa 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -12,7 +12,7 @@ use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
-use dom::bindings::conversions::{FromJSValConvertible, jsstring_to_str};
+use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, jsstring_to_str};
use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::js::Root;
@@ -45,8 +45,11 @@ pub fn handle_evaluate_js(global: &GlobalRef, eval: String, reply: IpcSender<Eva
} else if rval.is_boolean() {
EvaluateJSReply::BooleanValue(rval.to_boolean())
} else if rval.is_double() || rval.is_int32() {
- EvaluateJSReply::NumberValue(FromJSValConvertible::from_jsval(cx, rval.handle(), ())
- .unwrap())
+ EvaluateJSReply::NumberValue(
+ match FromJSValConvertible::from_jsval(cx, rval.handle(), ()) {
+ Ok(ConversionResult::Success(v)) => v,
+ _ => unreachable!(),
+ })
} else if rval.is_string() {
EvaluateJSReply::StringValue(String::from(jsstring_to_str(cx, rval.to_string())))
} else if rval.is_null() {