Skip to content
Permalink
Browse files

use str to_jsval() now

xmlhttprequest.rs, CodegenRust.py
replace into_string().to_jsval() to to_jsval()

conversions.rs
DOMString to_jsval() use as_slice().tojsval() now
  • Loading branch information...
yodalee committed Dec 28, 2014
1 parent 6f569de commit bb087c238bce1bc5e50ac02ff45d344061794519
@@ -2781,7 +2781,7 @@ def __init__(self, enum):
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)
@@ -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)
}
}

@@ -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(),

9 comments on commit bb087c2

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Dec 31, 2014

saw approval from jdm
at yodalee@bb087c2

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Dec 31, 2014

merging yodalee/servo/issue4484-ToJSValConvertible-for-str = bb087c2 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Dec 31, 2014

yodalee/servo/issue4484-ToJSValConvertible-for-str = bb087c2 merged ok, testing candidate = aaf099c

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Dec 31, 2014

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jan 1, 2015

saw approval from jdm
at yodalee@bb087c2

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jan 1, 2015

merging yodalee/servo/issue4484-ToJSValConvertible-for-str = bb087c2 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jan 1, 2015

yodalee/servo/issue4484-ToJSValConvertible-for-str = bb087c2 merged ok, testing candidate = fda38cf

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo replied Jan 1, 2015

fast-forwarding master to auto = fda38cf

Please sign in to comment.
You can’t perform that action at this time.