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 -->

1 files changed, 5 insertions, 2 deletions

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 4834218a89b..33f7da41d20 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()