aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/conversions.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/bindings/conversions.rs')
-rw-r--r--components/script/dom/bindings/conversions.rs21
1 files changed, 10 insertions, 11 deletions
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index ddfff41f8f5..8e9e656b0c4 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -272,9 +272,8 @@ pub fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString {
unsafe {
let mut length = 0;
let chars = JS_GetStringCharsAndLength(cx, s, &mut length);
- slice::raw::buf_as_slice(chars, length as uint, |char_vec| {
- String::from_utf16(char_vec).unwrap()
- })
+ let char_vec = slice::from_raw_buf(&chars, length as uint);
+ String::from_utf16(char_vec).unwrap()
}
}
@@ -328,14 +327,14 @@ impl FromJSValConvertible<()> for ByteString {
let mut length = 0;
let chars = JS_GetStringCharsAndLength(cx, string, &mut length);
- slice::raw::buf_as_slice(chars, length as uint, |char_vec| {
- if char_vec.iter().any(|&c| c > 0xFF) {
- // XXX Throw
- Err(())
- } else {
- Ok(ByteString::new(char_vec.iter().map(|&c| c as u8).collect()))
- }
- })
+ let char_vec = slice::from_raw_buf(&chars, length as uint);
+
+ if char_vec.iter().any(|&c| c > 0xFF) {
+ // XXX Throw
+ Err(())
+ } else {
+ Ok(ByteString::new(char_vec.iter().map(|&c| c as u8).collect()))
+ }
}
}
}