diff options
| author | Jack Moffitt <jack@metajack.im> | 2014-07-21 07:37:24 -0600 |
|---|---|---|
| committer | Jack Moffitt <jack@metajack.im> | 2014-08-02 21:11:47 -0600 |
| commit | b91e6f30e063cbcea4ffd750da8385ce448de797 (patch) | |
| tree | 3e762f7866e29379810ac1e612f7942979e21b87 /src/components/script/dom/bindings/conversions.rs | |
| parent | 8b6f62c195dd7e42d0b6a18f2ced6fa16bc29faa (diff) | |
| download | servo-b91e6f30e063cbcea4ffd750da8385ce448de797.tar.gz servo-b91e6f30e063cbcea4ffd750da8385ce448de797.zip | |
Upgrade Rust.
Diffstat (limited to 'src/components/script/dom/bindings/conversions.rs')
| -rw-r--r-- | src/components/script/dom/bindings/conversions.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/script/dom/bindings/conversions.rs b/src/components/script/dom/bindings/conversions.rs index 60d8d2a2b98..8ce5b55e9d3 100644 --- a/src/components/script/dom/bindings/conversions.rs +++ b/src/components/script/dom/bindings/conversions.rs @@ -227,7 +227,7 @@ impl FromJSValConvertible<()> for f64 { impl ToJSValConvertible for DOMString { fn to_jsval(&self, cx: *mut JSContext) -> JSVal { unsafe { - let string_utf16 = self.to_utf16(); + 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() { fail!("JS_NewUCStringCopyN failed"); @@ -272,7 +272,7 @@ impl ToJSValConvertible for ByteString { fn to_jsval(&self, cx: *mut JSContext) -> JSVal { unsafe { let slice = self.as_slice(); - let jsstr = JS_NewStringCopyN(cx, slice.as_ptr() as *libc::c_char, + let jsstr = JS_NewStringCopyN(cx, slice.as_ptr() as *const libc::c_char, slice.len() as libc::size_t); if jsstr.is_null() { fail!("JS_NewStringCopyN failed"); |