diff options
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 2 | ||||
| -rw-r--r-- | components/script/dom/bindings/conversions.rs | 9 | ||||
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 814f453c1f7..49abbdfd6fb 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2781,7 +2781,7 @@ pub const strings: &'static [&'static str] = &[ impl ToJSValConvertible for super::%s { fn to_jsval(&self, cx: *mut JSContext) -> JSVal { - strings[*self as uint].into_string().to_jsval(cx) + strings[*self as uint].to_jsval(cx) } } """ % (",\n ".join(['"%s"' % val for val in enum.values()]), enum.identifier.name) diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index a08e8dbb7e8..08c2abb9e8b 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -247,14 +247,7 @@ impl ToJSValConvertible for str { impl ToJSValConvertible for DOMString { fn to_jsval(&self, cx: *mut JSContext) -> JSVal { - unsafe { - let string_utf16: Vec<u16> = self.as_slice().utf16_units().collect(); - let jsstr = JS_NewUCStringCopyN(cx, string_utf16.as_ptr(), string_utf16.len() as libc::size_t); - if jsstr.is_null() { - panic!("JS_NewUCStringCopyN failed"); - } - StringValue(&*jsstr) - } + self.as_slice().to_jsval(cx) } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index b50a5c4330a..c8e2fbdd5a5 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -695,7 +695,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { if ready_state == XMLHttpRequestState::XHRDone || ready_state == XMLHttpRequestState::Loading { self.text_response().to_jsval(cx) } else { - "".into_string().to_jsval(cx) + "".to_jsval(cx) } }, _ if self.ready_state.get() != XMLHttpRequestState::XHRDone => NullValue(), |