aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/devtools.rs
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2016-08-20 14:05:47 +0200
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2016-08-24 12:56:49 +0200
commit2f3f4a5bd6d60d2f25a3133b18c1baa9d979c654 (patch)
treee3804d5db9fe40ef0b490a563cf405cbb8f59574 /components/script/devtools.rs
parent278bef474c3bc27052bd1d8ec3051eafe02b1239 (diff)
downloadservo-2f3f4a5bd6d60d2f25a3133b18c1baa9d979c654.tar.gz
servo-2f3f4a5bd6d60d2f25a3133b18c1baa9d979c654.zip
Update rust-mozjs dependency
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() {