aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/utils.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-10-28 23:35:40 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-10-28 23:35:40 +0530
commit30ce2a84c162915f71873e9e20955e12709b39ae (patch)
tree818c8f31d23371fad4f719ec7c416a7932f17110 /components/script/dom/bindings/utils.rs
parent0d699a2b4419632e31b35352c518e2ef5ffcc9a3 (diff)
parent2a2ab23dfb1205cda52fb386ebef140323a36ec3 (diff)
downloadservo-30ce2a84c162915f71873e9e20955e12709b39ae.tar.gz
servo-30ce2a84c162915f71873e9e20955e12709b39ae.zip
Auto merge of #8242 - Ms2ger:update-js, r=metajack
Update js. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8242) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/utils.rs')
-rw-r--r--components/script/dom/bindings/utils.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 45a06674cfc..6fae276271c 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -520,7 +520,7 @@ pub fn find_enum_string_index(cx: *mut JSContext,
v: HandleValue,
values: &[&'static str])
-> Result<Option<usize>, ()> {
- let jsstr = ToString(cx, v);
+ let jsstr = unsafe { ToString(cx, v) };
if jsstr.is_null() {
return Err(());
}