aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.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/script_thread.rs
parent278bef474c3bc27052bd1d8ec3051eafe02b1239 (diff)
downloadservo-2f3f4a5bd6d60d2f25a3133b18c1baa9d979c654.tar.gz
servo-2f3f4a5bd6d60d2f25a3133b18c1baa9d979c654.zip
Update rust-mozjs dependency
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 4dd3a3fba7f..c8e4a43a579 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -26,7 +26,7 @@ use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyState};
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
-use dom::bindings::conversions::{FromJSValConvertible, StringificationBehavior};
+use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, StringificationBehavior};
use dom::bindings::global::GlobalRef;
use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection};
@@ -1789,7 +1789,10 @@ impl ScriptThread {
let strval = DOMString::from_jsval(self.get_cx(),
jsval.handle(),
StringificationBehavior::Empty);
- strval.unwrap_or(DOMString::new())
+ match strval {
+ Ok(ConversionResult::Success(s)) => s,
+ _ => DOMString::new(),
+ }
}
} else {
DOMString::new()